diff options
author | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-20 18:37:14 +0200 |
---|---|---|
committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-20 18:37:14 +0200 |
commit | 75f37d7d27c2579ddb88f852087a54934cb00c8b (patch) | |
tree | bc0ff7f1ece45b7cbbbd325c390b6c03d9d7b364 | |
parent | c086ac18511ce648a0ed88ab470965470bd422c5 (diff) | |
download | apt-75f37d7d27c2579ddb88f852087a54934cb00c8b.tar.gz |
move the creation of the manpage-style.xsl file to the rest of the
manpage building instead of doing it at setup time, so we can properly
depend on it
-rw-r--r-- | buildlib/po4a_manpage.mak | 6 | ||||
-rw-r--r-- | doc/makefile | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 5814180d8..1dedd0dcd 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -28,7 +28,11 @@ veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent cp ../apt-verbatim.ent . -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +manpage-style.xsl: ../manpage-style.xsl + sed "/<!-- LANGUAGE -->/ i\ +<xsl:param name=\"l10n.gentext.default.language\" select=\"'$(LC)'\" />" ../manpage-style.xsl > manpage-style.xsl + +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed diff --git a/doc/makefile b/doc/makefile index 76e29e2b9..4c0a431fd 100644 --- a/doc/makefile +++ b/doc/makefile @@ -29,7 +29,7 @@ $(LOCAL)-LIST := $(SOURCE) # Install generation hooks manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST) -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< @@ -42,8 +42,6 @@ dirs-manpage-subdirs: for i in $(MANPAGEPO); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - test -f $$i/manpage-style.xsl || sed "/<!-- LANGUAGE -->/ i\ -<xsl:param name=\"l10n.gentext.default.language\" select=\"'$$i'\" />" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule |