* [gentoo-commits] gentoo-x86 commit in dev-util/bless/files: bless-0.6.0-docpath.patch
@ 2009-12-13 17:01 Mike Auty (ikelos)
0 siblings, 0 replies; only message in thread
From: Mike Auty (ikelos) @ 2009-12-13 17:01 UTC (permalink / raw
To: gentoo-commits
ikelos 09/12/13 17:01:20
Modified: bless-0.6.0-docpath.patch
Log:
Fix up doc install issue (bug 296669).
(Portage version: 2.2_rc56/cvs/Linux i686)
Revision Changes Path
1.2 dev-util/bless/files/bless-0.6.0-docpath.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bless/files/bless-0.6.0-docpath.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bless/files/bless-0.6.0-docpath.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/bless/files/bless-0.6.0-docpath.patch?r1=1.1&r2=1.2
Index: bless-0.6.0-docpath.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/bless/files/bless-0.6.0-docpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bless-0.6.0-docpath.patch 13 Dec 2009 14:07:47 -0000 1.1
+++ bless-0.6.0-docpath.patch 13 Dec 2009 17:01:20 -0000 1.2
@@ -1,103 +1,71 @@
diff --git a/Makefile.am b/Makefile.am
-index 33f265b..23fcb0e 100644
+index 33f265b..346326d 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -35,10 +35,10 @@ dist-hook:
+@@ -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-data-local:
- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
-+ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
- $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
- README README.packaging bless.spec \
+- $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
+- README README.packaging bless.spec \
- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
-+ $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-
+-
uninstall-local:
rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 13ea7ed..207c17a 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -12,7 +12,7 @@ PWD=$(shell pwd)
- help_script.sh: help_script.tmpl
- sed -e 's,@blessdocdir\@,$(PWD)/../doc,g' help_script.tmpl > help_script.sh
- chmod +x help_script.sh
-- sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME),g' help_script.tmpl > help_script.sh.install
-+ sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install
-
- install-data-local:
- $(INSTALL) -d $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
diff --git a/doc/Makefile.am b/doc/Makefile.am
-index b18e94a..c0e700d 100644
+index b18e94a..d7eecc6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -1,4 +1,4 @@
+@@ -1,4 +1 @@
SUBDIRS= developer user
-
- uninstall-local:
+-
+-uninstall-local:
- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
-+ rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am
-index 65911f8..c13f216 100644
---- a/doc/developer/Makefile.am
-+++ b/doc/developer/Makefile.am
-@@ -4,8 +4,8 @@ DOCS=$(srcdir)/en/*.xml \
- EXTRA_DIST=$(DOCS) bless-docs.source
-
- #install-data-local:
--# $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
--# $(INSTALL_DATA) $(MD_FILES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
-+# $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
-+# $(INSTALL_DATA) $(MD_FILES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
-
- #uninstall-local:
--# rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/developer
-+# rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
-index 729b295..b1d371d 100644
+index 729b295..58a1358 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
-@@ -10,7 +10,7 @@ noinst_SCRIPTS=$(OMF)
+@@ -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 \
-- scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)/user/bless-manual.xml $(OMF).in $(OMF); \
-+ scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/bless-manual.xml $(OMF).in $(OMF); \
- else \
- cp $(OMF).in $(OMF); \
- fi
-@@ -27,22 +27,22 @@ dist-hook: doc
+@@ -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) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
-+ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
- $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \
+- $(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)
-+ $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
-+ $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures
-+ $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-+ $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+ $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
+ $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
if WITH_SCROLLKEEPER
-- scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
-+ scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+@@ -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)
-+ rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user
-+ rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(OMF)
+ rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF)
if WITH_SCROLLKEEPER
-- scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
-+ scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
- endif
-- rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
-+ rm -rf $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-
+ scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-12-13 17:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-13 17:01 [gentoo-commits] gentoo-x86 commit in dev-util/bless/files: bless-0.6.0-docpath.patch Mike Auty (ikelos)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox