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

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 5814180d8a250a1830b2c400a546e20d293781a8..1dedd0dcd996a9b6e2b5fd2ebbb592ae79f578f3 100644 (file)
--- 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 .
 
 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
        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 76e29e2b995c1042d06dc55883f2fc213f15b92a..4c0a431fd08c873791d20f2cbd4117c30200a2dc 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -29,7 +29,7 @@ $(LOCAL)-LIST := $(SOURCE)
 # Install generation hooks
 manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST)
 
 # Install generation hooks
 manpages: $(MANPAGEPOLIST) $($(LOCAL)-LIST)
 

-$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
+$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)

        echo Creating man page $@
        $(XSLTPROC) -o $@ $(STYLESHEET) $<
 
        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; \
        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
        done
 
 # Clean rule