[Aptitude-svn-commit] r4417 - in branches/aptitude-0.3/aptitude: . doc/cs doc/de doc/en doc/fi doc/fr

Daniel Burrows dburrows at costa.debian.org
Sat Oct 1 18:08:54 UTC 2005 

Author: dburrows
Date: Sat Oct  1 18:08:50 2005
New Revision: 4417

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/cs/Makefile.am
   branches/aptitude-0.3/aptitude/doc/de/Makefile.am
   branches/aptitude-0.3/aptitude/doc/en/Makefile.am
   branches/aptitude-0.3/aptitude/doc/fi/Makefile.am
   branches/aptitude-0.3/aptitude/doc/fr/Makefile.am
Log:
Fix doc/ for VPATH builds.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Oct  1 18:08:50 2005
@@ -1,5 +1,11 @@
 2005-10-01  Daniel Burrows  <dburrows at debian.org>
 
+	* doc/cs/Makefile.am, doc/de/Makefile.am, doc/en/Makefile.am, doc/fi/Makefile.am, doc/fr/Makefile.am:
+
+	  Fix the documentation Makefiles to refer symbolically to the
+	  souce directory using $(srcdir) instead of directly via '..' and
+	  '.'.
+
 	* NEWS:
 
 	  Add a comment about whitespace in patterns, change the quote.

Modified: branches/aptitude-0.3/aptitude/doc/cs/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/cs/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/doc/cs/Makefile.am	Sat Oct  1 18:08:50 2005
@@ -15,6 +15,8 @@
 README=README.$(LANGCODE)
 MANPAGE=aptitude.$(LANGCODE).8
 
+IMAGES = $(wildcard images/*.png)
+
 all-local: doc-stamp
 
 clean-local:
@@ -35,22 +37,22 @@
 doc-stamp: doc-html-stamp doc-css-stamp $(README) $(MANPAGE)
 	touch doc-stamp
 
-$(MANPAGE): aptitude.xml ../aptitude-man.xsl
+$(MANPAGE): aptitude.xml $(srcdir)/../aptitude-man.xsl
 	-rm -fr output-man
 	xsltproc -o output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
 	mv output-man/aptitude.8 $(MANPAGE)
 
-$(README): aptitude.xml ../aptitude-txt.xsl ../aptitude-common.xsl ../aptitude-txt.style
+$(README): aptitude.xml $(srcdir)/../aptitude-txt.xsl $(srcdir)/../aptitude-common.xsl ../aptitude-txt.style
 	-rm -fr output-txt/
 	xsltproc -o output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
-	html2text -width 80 -ascii -nobs -rcfile ../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
 
-doc-css-stamp: doc-html-stamp ../aptitude.css
+doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
 	rm -f output-html/aptitude.css
-	cp ../aptitude.css output-html/
+	cp $(srcdir)/../aptitude.css output-html/
 	touch doc-css-stamp
 
-doc-html-stamp: aptitude.xml ../aptitude-html.xsl ../aptitude-common.xsl images/*.png
+doc-html-stamp: aptitude.xml ../aptitude-html.xsl ../aptitude-common.xsl $(IMAGES)
 	-rm -fr output-html/
 
 	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml

Modified: branches/aptitude-0.3/aptitude/doc/de/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/de/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/doc/de/Makefile.am	Sat Oct  1 18:08:50 2005
@@ -16,6 +16,8 @@
 localemandir=$(mandir)/$(LANGCODE)
 htmldir=$(docdir)/html/$(LANGCODE)
 
+IMAGES = $(wildcard images/*.png)
+
 all-local: doc-stamp
 
 clean-local:
@@ -40,19 +42,19 @@
 	-rm -fr output-man $(MANPAGE)
 	xsltproc -o output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
 	mv output-man/aptitude.8 $(MANPAGE)
-	./fixquotes
+	$(srcdir)/fixquotes
 
-$(README): $(XMLSOURCES)  ../aptitude-txt.xsl ../aptitude-txt.style
+$(README): $(XMLSOURCES)  $(srcdir)/../aptitude-txt.xsl $(srcdir)/../aptitude-txt.style
 	-rm -fr output-txt
 	xsltproc -o output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
-	html2text -width 80 -ascii -nobs -rcfile ../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
 
-doc-css-stamp: doc-html-stamp ../aptitude.css
+doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
 	rm -f output-html/aptitude.css
-	cp ../aptitude.css output-html/
+	cp $(srcdir)/../aptitude.css output-html/
 	touch doc-css-stamp
 
-doc-html-stamp: $(XMLSOURCES) ../aptitude-html.xsl images/*.png
+doc-html-stamp: $(XMLSOURCES) $(srcdir)/../aptitude-html.xsl $(IMAGES)
 	-rm -fr output-html/
 
 	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml

Modified: branches/aptitude-0.3/aptitude/doc/en/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/Makefile.am	Sat Oct  1 18:08:50 2005
@@ -10,6 +10,8 @@
 # Automake automagically distributes README without asking..
 README=README.en
 
+IMAGES = $(wildcard images/*.png)
+
 all-local: doc-stamp
 
 clean-local:
@@ -30,22 +32,22 @@
 doc-stamp: doc-html-stamp doc-css-stamp $(README) aptitude.8
 	touch doc-stamp
 
-aptitude.8: aptitude.xml manpage.xml ../aptitude-man.xsl
+aptitude.8: aptitude.xml manpage.xml $(srcdir)/../aptitude-man.xsl
 	-rm -fr output-man
 	xsltproc -o output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
 	mv output-man/aptitude.8 .
 
-$(README): aptitude.xml manpage.xml ../aptitude-txt.xsl ../aptitude-common.xsl ../aptitude-txt.style
+$(README): aptitude.xml manpage.xml $(srcdir)/../aptitude-txt.xsl $(srcdir)/../aptitude-common.xsl $(srcdir)/../aptitude-txt.style
 	-rm -fr output-txt/
 	xsltproc -o output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
-	html2text -width 80 -ascii -nobs -rcfile ../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
 
-doc-css-stamp: doc-html-stamp ../aptitude.css
+doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
 	rm -f output-html/aptitude.css
-	cp ../aptitude.css output-html/
+	cp $(srcdir)/../aptitude.css output-html/
 	touch doc-css-stamp
 
-doc-html-stamp: aptitude.xml manpage.xml ../aptitude-html.xsl ../aptitude-common.xsl images/*.png
+doc-html-stamp: aptitude.xml manpage.xml $(srcdir)/../aptitude-html.xsl $(srcdir)/../aptitude-common.xsl $(IMAGES)
 	-rm -fr output-html/
 
 	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml

Modified: branches/aptitude-0.3/aptitude/doc/fi/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/fi/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/doc/fi/Makefile.am	Sat Oct  1 18:08:50 2005
@@ -14,6 +14,8 @@
 # Automake automagically distributes README without asking..
 README=README.$(LANGCODE)
 
+IMAGES = $(wildcard images/*.png)
+
 all-local: doc-stamp
 
 clean-local:
@@ -36,23 +38,23 @@
 doc-stamp: doc-html-stamp doc-css-stamp $(README) $(MANPAGE)
 	touch doc-stamp
 
-$(MANPAGE): aptitude.xml manpage.xml ../aptitude-man.xsl
+$(MANPAGE): aptitude.xml manpage.xml $(srcdir)/../aptitude-man.xsl
 	-rm -fr output-man
 	xsltproc -o output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
 	mv output-man/aptitude.8 $(MANPAGE)
 	./fixman
 
-$(README): aptitude.xml manpage.xml ../aptitude-txt.xsl ../aptitude-common.xsl ../aptitude-txt.style
+$(README): aptitude.xml manpage.xml $(srcdir)/../aptitude-txt.xsl $(srcdir)/../aptitude-common.xsl $(srcdir)/../aptitude-txt.style
 	-rm -fr output-txt/
 	xsltproc -o output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
-	html2text -width 80 -ascii -nobs -rcfile ../aptitude-txt.style output-txt/index.html | sed 's/&#8220;/"/g;s/&#8221;/"/g;s/&#8212;/--/g;s/&#381;/Zh/g;s/&#353;/sh/g' > $(README)
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8220;/"/g;s/&#8221;/"/g;s/&#8212;/--/g;s/&#381;/Zh/g;s/&#353;/sh/g' > $(README)
 
-doc-css-stamp: doc-html-stamp ../aptitude.css
+doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
 	rm -f output-html/aptitude.css
-	cp ../aptitude.css output-html/
+	cp $(srcdir)/../aptitude.css output-html/
 	touch doc-css-stamp
 
-doc-html-stamp: aptitude.xml manpage.xml ../aptitude-html.xsl ../aptitude-common.xsl images/*.png
+doc-html-stamp: aptitude.xml manpage.xml $(srcdir)/../aptitude-html.xsl $(srcdir)/../aptitude-common.xsl $(IMAGES)
 	-rm -fr output-html/
 
 	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml

Modified: branches/aptitude-0.3/aptitude/doc/fr/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/fr/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/doc/fr/Makefile.am	Sat Oct  1 18:08:50 2005
@@ -6,6 +6,8 @@
 LANGCODE=fr
 MANPAGE=aptitude.$(LANGCODE).8
 
+IMAGES = $(wildcard images/*.png)
+
 # Put documentation in /usr/share/doc/aptitude (by default)
 docdir=$(datadir)/doc/$(PACKAGE)
 
@@ -32,23 +34,23 @@
 doc-stamp: doc-html-stamp doc-css-stamp $(README) $(MANPAGE)
 	touch doc-stamp
 
-$(MANPAGE): aptitude.xml manpage.xml ../aptitude-man.xsl
+$(MANPAGE): aptitude.xml manpage.xml $(srcdir)/../aptitude-man.xsl
 	-rm -fr output-man
 	xsltproc -o output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
 	mv output-man/aptitude.8 $(MANPAGE)
 	./fixman
 
-$(README): aptitude.xml manpage.xml ../aptitude-txt.xsl ../aptitude-common.xsl ../aptitude-txt.style
+$(README): aptitude.xml manpage.xml $(srcdir)/../aptitude-txt.xsl $(srcdir)/../aptitude-common.xsl $(srcdir)/../aptitude-txt.style
 	-rm -fr output-txt/
 	xsltproc -o output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
-	html2text -width 80 -ascii -nobs -rcfile ../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
 
-doc-css-stamp: doc-html-stamp ../aptitude.css
+doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
 	rm -f output-html/aptitude.css
-	cp ../aptitude.css output-html/
+	cp $(srcdir)/../aptitude.css output-html/
 	touch doc-css-stamp
 
-doc-html-stamp: aptitude.xml manpage.xml ../aptitude-html.xsl ../aptitude-common.xsl images/*.png
+doc-html-stamp: aptitude.xml manpage.xml $(srcdir)/../aptitude-html.xsl $(srcdir)/../aptitude-common.xsl $(IMAGES)
 	-rm -fr output-html/
 
 	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml

More information about the Aptitude-svn-commit mailing list