bless-0.6.0-docpath.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172
  1. diff --git a/Makefile.am b/Makefile.am
  2. index 33f265b..346326d 100644
  3. --- a/Makefile.am
  4. +++ b/Makefile.am
  5. @@ -1,6 +1,9 @@
  6. EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging \
  7. bless.mdp bless.mds bless.spec autogen.sh bless.mi
  8. +doc_DATA = AUTHORS COPYING INSTALL ChangeLog NEWS \
  9. + README README.packaging bless.spec
  10. +
  11. SUBDIRS = po builder src bin data doc . tests
  12. DIST_SUBDIRS= po builder src bin doc data tests
  13. @@ -34,11 +37,5 @@ bless-builder:
  14. dist-hook:
  15. bzr log > $(distdir)/ChangeLog
  16. -install-data-local:
  17. - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
  18. - $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
  19. - README README.packaging bless.spec \
  20. - $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
  21. -
  22. uninstall-local:
  23. rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
  24. diff --git a/doc/Makefile.am b/doc/Makefile.am
  25. index b18e94a..d7eecc6 100644
  26. --- a/doc/Makefile.am
  27. +++ b/doc/Makefile.am
  28. @@ -1,4 +1 @@
  29. SUBDIRS= developer user
  30. -
  31. -uninstall-local:
  32. - rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
  33. diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
  34. index 729b295..58a1358 100644
  35. --- a/doc/user/Makefile.am
  36. +++ b/doc/user/Makefile.am
  37. @@ -7,6 +7,11 @@ CLEANFILES=$(OMF)
  38. noinst_SCRIPTS=$(OMF)
  39. +docmandir=$(docdir)/user
  40. +docfigsdir=$(docmandir)/figures
  41. +
  42. +docfigs_DATA=$(FIGURES)
  43. +docman_DATA=$(DOCS) $(wildcard *.html)
  44. $(OMF): $(OMF).in
  45. if [ -x `which scrollkeeper-preinstall` ]; then \
  46. @@ -27,11 +32,6 @@ dist-hook: doc
  47. rm html_file_list
  48. install-data-local:
  49. - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
  50. - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
  51. - $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \
  52. - $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
  53. - $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
  54. $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
  55. $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
  56. if WITH_SCROLLKEEPER
  57. @@ -39,7 +39,6 @@ if WITH_SCROLLKEEPER
  58. endif
  59. uninstall-local:
  60. - rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
  61. rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF)
  62. if WITH_SCROLLKEEPER
  63. scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)