diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-util/bless/files/bless-0.6.0-docpath.patch | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-util/bless/files/bless-0.6.0-docpath.patch')
-rw-r--r-- | dev-util/bless/files/bless-0.6.0-docpath.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/dev-util/bless/files/bless-0.6.0-docpath.patch b/dev-util/bless/files/bless-0.6.0-docpath.patch new file mode 100644 index 000000000000..b1121424d88b --- /dev/null +++ b/dev-util/bless/files/bless-0.6.0-docpath.patch @@ -0,0 +1,71 @@ +diff --git a/Makefile.am b/Makefile.am +index 33f265b..346326d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,9 @@ + EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging \ + bless.mdp bless.mds bless.spec autogen.sh bless.mi + ++doc_DATA = AUTHORS COPYING INSTALL ChangeLog NEWS \ ++ README README.packaging bless.spec ++ + SUBDIRS = po builder src bin data doc . tests + + DIST_SUBDIRS= po builder src bin doc data tests +@@ -34,11 +37,5 @@ bless-builder: + dist-hook: + bzr log > $(distdir)/ChangeLog + +-install-data-local: +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) +- $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \ +- README README.packaging bless.spec \ +- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) +- + uninstall-local: + rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME) +diff --git a/doc/Makefile.am b/doc/Makefile.am +index b18e94a..d7eecc6 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,4 +1 @@ + SUBDIRS= developer user +- +-uninstall-local: +- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME) +diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am +index 729b295..58a1358 100644 +--- a/doc/user/Makefile.am ++++ b/doc/user/Makefile.am +@@ -7,6 +7,11 @@ CLEANFILES=$(OMF) + + noinst_SCRIPTS=$(OMF) + ++docmandir=$(docdir)/user ++docfigsdir=$(docmandir)/figures ++ ++docfigs_DATA=$(FIGURES) ++docman_DATA=$(DOCS) $(wildcard *.html) + + $(OMF): $(OMF).in + if [ -x `which scrollkeeper-preinstall` ]; then \ +@@ -27,11 +32,6 @@ dist-hook: doc + rm html_file_list + + install-data-local: +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures +- $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \ +- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user +- $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures + $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) + $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) + if WITH_SCROLLKEEPER +@@ -39,7 +39,6 @@ if WITH_SCROLLKEEPER + endif + + uninstall-local: +- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user + rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF) + if WITH_SCROLLKEEPER + scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) |