DOCBOOK_HTML_XSL contains all xsl dependencies

3 files changed, 11 insertions, 8 deletions

diff --git a/buildlib/docbook.mk b/buildlib/docbook.mk
index 76d0378a..b9a5432a 100644
--- a/buildlib/docbook.mk
+++ b/buildlib/docbook.mk
@@ -6,7 +6,7 @@ dbiftargets = $(if $(findstring $(1),$(DOCBOOK_TARGETS)),$(2))
 DOCBOOK_IMAGES ?= $(patsubst %.svg,%.png,$(IMAGES))
 
 DOCBOOK_XML ?= aptitude.xml manpage.xml
-DOCBOOK_HTML_XSL ?= aptitude-html.xsl
+DOCBOOK_HTML_XSL ?= aptitude-html.xsl aptitude-common.xsl
 
 DOCBOOK_HTML ?= $(wildcard output-html/*.html) $(wildcard output-html/*.css)
 DOCBOOK_HTML_IMAGES ?= $(wildcard output-html/images/*.png) $(wildcard output-html/images/*.gif)
@@ -120,7 +120,7 @@ if HAVE_XSLTPROC
 
 docbook-man-stamp: $(DOCBOOK_XML) aptitude-man.xsl aptitude-common.xsl
 	-rm -fr output-man/
-	$(XSLTPROC) -o output-man/aptitude.8 $(filter %aptitude-man.xsl,$^) $<
+	$(XSLTPROC) -o output-man/aptitude.8 $(firstword $(filter %.xsl,$^)) $<
 	ln -f $(addprefix output-man/,$(DOCBOOK_MANS)) .
 	@if [ -x "$(srcdir)/fixman" ]; then \
 	  for i in $(DOCBOOK_MANS); do \
@@ -130,14 +130,14 @@ docbook-man-stamp: $(DOCBOOK_XML) aptitude-man.xsl aptitude-common.xsl
         fi
 	touch docbook-man-stamp
 
-docbook-html-stamp: $(DOCBOOK_XML) $(DOCBOOK_HTML_XSL) aptitude-common.xsl
+docbook-html-stamp: $(DOCBOOK_XML) $(DOCBOOK_HTML_XSL)
 	-rm -fr output-html/
-	$(XSLTPROC) -o output-html/ $(filter %$(DOCBOOK_HTML_XSL),$^) $<
+	$(XSLTPROC) -o output-html/ $(firstword $(filter %.xsl,$^)) $<
 	touch docbook-html-stamp
 
 docbook-readme-stamp: $(DOCBOOK_XML) aptitude-txt.xsl aptitude-common.xsl
 	-rm -fr output-readme/ $(README)
-	$(XSLTPROC) -o output-readme/index.html $(filter %aptitude-txt.xsl,$^) $<
+	$(XSLTPROC) -o output-readme/index.html $(firstword $(filter %.xsl,$^)) $<
 	@echo "$(HTML2TEXT) output-readme/index.html $(README_encoding) > $(README)"; \
 	$(HTML2TEXT) output-readme/index.html $(README_encoding) > $(README) \
 	    || (rm -f $(README); exit 1)
@@ -145,7 +145,7 @@ docbook-readme-stamp: $(DOCBOOK_XML) aptitude-txt.xsl aptitude-common.xsl
 
 docbook-fo-stamp: $(DOCBOOK_XML) aptitude-fo.xsl aptitude-common.xsl $(IMAGES)
 	-rm -fr output-fo/
-	$(XSLTPROC) -o output-fo/aptitude.fo $(filter %aptitude-fo.xsl,$^) $<
+	$(XSLTPROC) -o output-fo/aptitude.fo $(firstword $(filter %.xsl,$^)) $<
 
 	mkdir output-fo/images/
 	ln -f $(srcdir)/images/*.png output-fo/images/
diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am
index b6a68dc9..628ee4f5 100644
--- a/doc/ja/Makefile.am
+++ b/doc/ja/Makefile.am
@@ -11,7 +11,7 @@ README_encoding = utf-8
 
 IMAGES := $(wildcard $(srcdir)/images/*.png) $(PO4A_IMAGES)
 
-DOCBOOK_HTML_XSL = aptitude-html-ja.xsl
+DOCBOOK_HTML_XSL = aptitude-html-ja.xsl aptitude-html.xsl aptitude-common.xsl
 
 DOCBOOK_MANS = aptitude.8
 DOCBOOK_TARGETS = docbook-html docbook-man docbook-readme
diff --git a/doc/xx/Makefile.am b/doc/xx/Makefile.am
index 32d88ddc..39b8fdf1 100644
--- a/doc/xx/Makefile.am
+++ b/doc/xx/Makefile.am
@@ -28,7 +28,10 @@ IMAGES := $(wildcard $(srcdir)/images/*.png) $(PO4A_IMAGES)
 # Uncomment this to provide your own stylesheet for producing the html
 # output.  Such a stylesheet could, for example, change the output
 # encoding of the html document.
-#DOCBOOK_HTML_XSL = aptitude-html-xx.xsl
+#
+# Set this to your stylesheet, then any that it imports.  Only the
+# first value is passed to xsltproc.
+#DOCBOOK_HTML_XSL = aptitude-html-xx.xsl aptitude-html.xsl aptitude-common.xsl
 
 # By default the docbook-man target will output all available
 # man pages.  Uncomment this line if you only have the main one