[Aptitude-svn-commit] r4421 - 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 19:04:42 UTC 2005 

Author: dburrows
Date: Sat Oct  1 19:04:39 2005
New Revision: 4421

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:
Documentation output goes under $(builddir).

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Oct  1 19:04:39 2005
@@ -1,5 +1,10 @@
 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:
+
+	  Consistently put the output directories in $(builddir), not
+	  $(srcdir).
+
 	* src/mine/Makefile.am:
 
 	  Use $(wildcard) instead of listing all the help texts

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 19:04:39 2005
@@ -20,7 +20,7 @@
 all-local: doc-stamp
 
 clean-local:
-	-rm -fr output-html/ output-txt/ output-man/
+	-rm -fr $(builddir)/output-html/ $(builddir)/output-txt/ $(builddir)/output-man/
 	-rm -f doc-stamp doc-css-stamp doc-html-stamp doc-txt-stamp doc-man-stamp
 	-rm -fr $(MANPAGE) $(README)
 
@@ -31,35 +31,35 @@
 	$(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(localemandir)/man8/aptitude.8
 
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)/images
-	$(INSTALL_DATA) $(srcdir)/output-html/*.html $(srcdir)/output-html/*.css $(DESTDIR)$(htmldir)
-	$(INSTALL_DATA) $(srcdir)/output-html/images/* $(DESTDIR)$(htmldir)/images
+	$(INSTALL_DATA) $(builddir)/output-html/*.html $(builddir)/output-html/*.css $(DESTDIR)$(htmldir)
+	$(INSTALL_DATA) $(builddir)/output-html/images/* $(DESTDIR)$(htmldir)/images
 
 doc-stamp: doc-html-stamp doc-css-stamp $(README) $(MANPAGE)
 	touch doc-stamp
 
 $(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)
+	-rm -fr $(builddir)/output-man
+	xsltproc -o $(builddir)/output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
+	mv $(builddir)/output-man/aptitude.8 $(MANPAGE)
 
 $(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 $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
+	-rm -fr $(builddir)/output-txt/
+	xsltproc -o $(builddir)/output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style $(builddir)/output-txt/index.html | sed 's/&#8212/--/g' > $(README)
 
 doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
-	rm -f output-html/aptitude.css
-	cp $(srcdir)/../aptitude.css output-html/
+	rm -f $(builddir)/output-html/aptitude.css
+	cp $(srcdir)/../aptitude.css $(builddir)/output-html/
 	touch doc-css-stamp
 
 doc-html-stamp: aptitude.xml ../aptitude-html.xsl ../aptitude-common.xsl $(IMAGES)
-	-rm -fr output-html/
+	-rm -fr $(builddir)/output-html/
 
-	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
+	xsltproc -o $(builddir)/output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
 
-	mkdir output-html/images/
-	ln -f $(srcdir)/images/*.png output-html/images/
-	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
-	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
+	mkdir $(builddir)/output-html/images/
+	ln -f $(srcdir)/images/*.png $(builddir)/output-html/images/
+	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png $(builddir)/output-html/images/; done
+	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif $(builddir)/output-html/images/; done
 
 	touch doc-html-stamp

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 19:04:39 2005
@@ -21,7 +21,7 @@
 all-local: doc-stamp
 
 clean-local:
-	-rm -fr output-html/ output-txt/ output-man/
+	-rm -fr $(builddir)/output-html/ $(builddir)/output-txt/ $(builddir)/output-man/
 	-rm -f doc-stamp doc-css-stamp doc-html-stamp doc-txt-stamp doc-man-stamp
 	-rm -fr $(MANPAGE) aptitude.8 $(README) *.tmp
 
@@ -30,8 +30,8 @@
 	$(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(localemandir)/man8/aptitude.8
 
 	# $(mkinstalldirs) $(htmldir)/images
-	# $(INSTALL_DATA) $(srcdir)/output-html/*.html $(srcdir)/output-html/*.css $(htmldir)
-	# $(INSTALL_DATA) $(srcdir)/output-html/images/* $(htmldir)/images
+	# $(INSTALL_DATA) $(builddir)/output-html/*.html $(builddir)/output-html/*.css $(htmldir)
+	# $(INSTALL_DATA) $(builddir)/output-html/images/* $(htmldir)/images
 	# $(INSTALL_DATA) $(srcdir)/$(README) $(DESTDIR)$(pkgdatadir)/$(README)
 
 #doc-stamp: doc-html-stamp doc-css-stamp $(README) $(MANPAGE)
@@ -39,30 +39,30 @@
 	touch doc-stamp
 
 $(MANPAGE): $(XMLSOURCES) ../aptitude-man.xsl
-	-rm -fr output-man $(MANPAGE)
-	xsltproc -o output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
-	mv output-man/aptitude.8 $(MANPAGE)
+	-rm -fr $(builddir)/output-man $(MANPAGE)
+	xsltproc -o $(builddir)/output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
+	mv $(builddir)/output-man/aptitude.8 $(MANPAGE)
 	$(srcdir)/fixquotes
 
 $(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 $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
+	-rm -fr $(builddir)/output-txt
+	xsltproc -o $(builddir)/output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style $(builddir)/output-txt/index.html | sed 's/&#8212/--/g' > $(README)
 
 doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
-	rm -f output-html/aptitude.css
-	cp $(srcdir)/../aptitude.css output-html/
+	rm -f $(builddir)/output-html/aptitude.css
+	cp $(srcdir)/../aptitude.css $(builddir)/output-html/
 	touch doc-css-stamp
 
 doc-html-stamp: $(XMLSOURCES) $(srcdir)/../aptitude-html.xsl $(IMAGES)
-	-rm -fr output-html/
+	-rm -fr $(builddir)/output-html/
 
-	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
+	xsltproc -o $(builddir)/output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
 
-	mkdir output-html/images/
-	ln -f $(srcdir)/images/*.png output-html/images/
-	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
-	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
+	mkdir $(builddir)/output-html/images/
+	ln -f $(srcdir)/images/*.png $(builddir)/output-html/images/
+	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png $(builddir)/output-html/images/; done
+	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif $(builddir)/output-html/images/; done
 
 	touch doc-html-stamp
 

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 19:04:39 2005
@@ -15,7 +15,7 @@
 all-local: doc-stamp
 
 clean-local:
-	-rm -fr output-html/ output-txt/ output-man/
+	-rm -fr $(builddir)/output-html/ $(builddir)/output-txt/ $(builddir)/output-man/
 	-rm -f doc-stamp doc-css-stamp doc-html-stamp doc-txt-stamp doc-man-stamp
 	-rm -fr aptitude.8 $(README)
 
@@ -23,8 +23,8 @@
 
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/en/images
-	$(INSTALL_DATA) $(srcdir)/output-html/*.html $(srcdir)/output-html/*.css $(DESTDIR)$(docdir)/html/en
-	$(INSTALL_DATA) $(srcdir)/output-html/images/* $(DESTDIR)$(docdir)/html/en/images
+	$(INSTALL_DATA) $(builddir)/output-html/*.html $(builddir)/output-html/*.css $(DESTDIR)$(docdir)/html/en
+	$(INSTALL_DATA) $(builddir)/output-html/images/* $(DESTDIR)$(docdir)/html/en/images
 
 	# I hate automake
 	$(INSTALL_DATA) $(srcdir)/README.en $(DESTDIR)$(pkgdatadir)/README
@@ -33,28 +33,28 @@
 	touch doc-stamp
 
 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 .
+	-rm -fr $(builddir)/output-man
+	xsltproc -o $(builddir)/output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
+	mv $(builddir)/output-man/aptitude.8 .
 
 $(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 $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
+	-rm -fr $(builddir)/output-txt/
+	xsltproc -o $(builddir)/output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style $(builddir)/output-txt/index.html | sed 's/&#8212/--/g' > $(README)
 
 doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
-	rm -f output-html/aptitude.css
-	cp $(srcdir)/../aptitude.css output-html/
+	rm -f $(builddir)/output-html/aptitude.css
+	cp $(srcdir)/../aptitude.css $(builddir)/output-html/
 	touch doc-css-stamp
 
-doc-html-stamp: aptitude.xml manpage.xml $(srcdir)/../aptitude-html.xsl $(srcdir)/../aptitude-common.xsl $(IMAGES)
-	-rm -fr output-html/
+doc-html-stamp: aptitude.xml manpage.xml $(srcdir)/../aptitude-html.xsl $(srcdir)/../\aptitude-common.xsl $(IMAGES)
+	-rm -fr $(builddir)/output-html/
 
-	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
+	xsltproc -o $(builddir)/output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
 
-	mkdir output-html/images/
-	ln -f $(srcdir)/images/*.png output-html/images/
-	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
-	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
+	mkdir $(builddir)/output-html/images/
+	ln -f $(srcdir)/images/*.png $(builddir)/output-html/images/
+	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png $(builddir)/output-html/images/; done
+	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif $(builddir)/output-html/images/; done
 
 	touch doc-html-stamp

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 19:04:39 2005
@@ -19,7 +19,7 @@
 all-local: doc-stamp
 
 clean-local:
-	-rm -fr output-html/ output-txt/ output-man/
+	-rm -fr $(builddir)/output-html/ $(builddir)/output-txt/ $(builddir)/output-man/
 	-rm -f doc-stamp doc-css-stamp doc-html-stamp doc-txt-stamp doc-man-stamp
 	-rm -fr $(MANPAGE) $(README) *.tmp
 
@@ -29,8 +29,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(localemandir)/man8
 	$(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(localemandir)/man8/aptitude.8
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/images
-	$(INSTALL_DATA) $(srcdir)/output-html/*.html $(srcdir)/output-html/*.css $(DESTDIR)$(docdir)/html/$(LANGCODE)
-	$(INSTALL_DATA) $(srcdir)/output-html/images/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/images
+	$(INSTALL_DATA) $(builddir)/output-html/*.html $(builddir)/output-html/*.css $(DESTDIR)$(docdir)/html/$(LANGCODE)
+	$(INSTALL_DATA) $(builddir)/output-html/images/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/images
 
 	# I hate automake
 	$(INSTALL_DATA) $(srcdir)/README.$(LANGCODE) $(DESTDIR)$(pkgdatadir)/README.$(LANGCODE)
@@ -39,29 +39,29 @@
 	touch doc-stamp
 
 $(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)
+	-rm -fr $(builddir)/output-man
+	xsltproc -o $(builddir)/output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
+	mv $(builddir)/output-man/aptitude.8 $(MANPAGE)
 	$(srcdir)/fixman
 
 $(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 $(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)
+	-rm -fr $(builddir)/output-txt/
+	xsltproc -o $(builddir)/output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style $(builddir)/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 $(srcdir)/../aptitude.css
-	rm -f output-html/aptitude.css
-	cp $(srcdir)/../aptitude.css output-html/
+	rm -f $(builddir)/output-html/aptitude.css
+	cp $(srcdir)/../aptitude.css $(builddir)/output-html/
 	touch doc-css-stamp
 
 doc-html-stamp: aptitude.xml manpage.xml $(srcdir)/../aptitude-html.xsl $(srcdir)/../aptitude-common.xsl $(IMAGES)
-	-rm -fr output-html/
+	-rm -fr $(builddir)/output-html/
 
-	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
+	xsltproc -o $(builddir)/output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
 
-	mkdir output-html/images/
-	ln -f $(srcdir)/images/*.png output-html/images/
-	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
-	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
+	mkdir $(builddir)/output-html/images/
+	ln -f $(srcdir)/images/*.png $(builddir)/output-html/images/
+	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png $(builddir)/output-html/images/; done
+	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif $(builddir)/output-html/images/; done
 
 	touch doc-html-stamp

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 19:04:39 2005
@@ -17,7 +17,7 @@
 all-local: doc-stamp
 
 clean-local:
-	-rm -fr output-html/ output-txt/ output-man/
+	-rm -fr $(builddir)/output-html/ $(builddir)/output-txt/ $(builddir)/output-man/
 	-rm -f doc-stamp doc-css-stamp doc-html-stamp doc-txt-stamp doc-man-stamp
 	-rm -fr $(MANPAGE) $(README) *.tmp
 
@@ -25,8 +25,8 @@
 
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/images
-	$(INSTALL_DATA) $(srcdir)/output-html/*.html $(srcdir)/output-html/*.css $(DESTDIR)$(docdir)/html/$(LANGCODE)
-	$(INSTALL_DATA) $(srcdir)/output-html/images/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/images
+	$(INSTALL_DATA) $(builddir)/output-html/*.html $(builddir)/output-html/*.css $(DESTDIR)$(docdir)/html/$(LANGCODE)
+	$(INSTALL_DATA) $(builddir)/output-html/images/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/images
 
 	# I hate automake
 	$(INSTALL_DATA) $(srcdir)/README.$(LANGCODE) $(DESTDIR)$(pkgdatadir)/README.$(LANGCODE)
@@ -35,29 +35,29 @@
 	touch doc-stamp
 
 $(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)
+	-rm -fr $(builddir)/output-man
+	xsltproc -o $(builddir)/output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl $(srcdir)/aptitude.xml
+	mv $(builddir)/output-man/aptitude.8 $(MANPAGE)
 	$(srcdir)/fixman
 
 $(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 $(srcdir)/../aptitude-txt.style output-txt/index.html | sed 's/&#8212/--/g' > $(README)
+	-rm -fr $(builddir)/output-txt/
+	xsltproc -o $(builddir)/output-txt/index.html $(srcdir)/../aptitude-txt.xsl $(srcdir)/aptitude.xml
+	html2text -width 80 -ascii -nobs -rcfile $(srcdir)/../aptitude-txt.style $(builddir)/output-txt/index.html | sed 's/&#8212/--/g' > $(README)
 
 doc-css-stamp: doc-html-stamp $(srcdir)/../aptitude.css
-	rm -f output-html/aptitude.css
-	cp $(srcdir)/../aptitude.css output-html/
+	rm -f $(builddir)/output-html/aptitude.css
+	cp $(srcdir)/../aptitude.css $(builddir)/output-html/
 	touch doc-css-stamp
 
 doc-html-stamp: aptitude.xml manpage.xml $(srcdir)/../aptitude-html.xsl $(srcdir)/../aptitude-common.xsl $(IMAGES)
-	-rm -fr output-html/
+	-rm -fr $(builddir)/output-html/
 
-	xsltproc -o output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
+	xsltproc -o $(builddir)/output-html/ $(srcdir)/../aptitude-html.xsl $(srcdir)/aptitude.xml
 
-	mkdir output-html/images/
-	ln -f $(srcdir)/images/*.png output-html/images/
-	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
-	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
+	mkdir $(builddir)/output-html/images/
+	ln -f $(srcdir)/images/*.png $(builddir)/output-html/images/
+	for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png $(builddir)/output-html/images/; done
+	for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif $(builddir)/output-html/images/; done
 
 	touch doc-html-stamp

More information about the Aptitude-svn-commit mailing list