more explicit MarkRequired algorithm code

[apt.git] / buildlib / po4a_manpage.mak

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index b3d586b2f5244e75c8c89e2bedf98b1c514b2acd..df12e115c41586d1713c05158c2cd33961699ac0 100644 (file)
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -15,6 +15,9 @@ INCLUDES = apt.ent apt-verbatim.ent apt-vendor.ent
 
 manpages:
 
+%.xsl: ../%.xsl
+       cp -a $< .
+
 # Do not use XMLTO, build the manpages directly with XSLTPROC
 ifdef XSLTPROC
 
@@ -34,13 +37,11 @@ apt-verbatim.ent: ../apt-verbatim.ent
 apt-vendor.ent: ../apt-vendor.ent
        cp -a ../apt-vendor.ent .
 
-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???
+       $(XSLTPROC) \
+               --stringparam l10n.gentext.default.language $(LC) \
+               -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
        test -f $(subst .$(LC),,$@) || echo 'FIXME: xsltproc respects the -o flag now, workaround can be removed'
        mv -f $(subst .$(LC),,$@) $@
 
@@ -50,17 +51,16 @@ clean/$(LOCAL):
        rm -f $($(@F)-LIST) apt.ent apt-verbatim.ent
 veryclean/$(LOCAL):
        # we are nuking the directory we are working in as it is auto-generated
-       rm -rf $(shell readlink -f .)
+       rm -rf '$(abspath .)'
 
 HAVE_PO4A=yes
 endif
 
 # take care of the rest
-SOURCE := $(SOURCE) $(wildcard apt.$(LC).8)
 INCLUDES :=
 
 ifndef HAVE_PO4A
-# Strip from the source list any man pages we dont have compiled already
+# Strip from the source list any man pages we don't have compiled already
 SOURCE := $(wildcard $(SOURCE))
 endif
 
@@ -69,7 +69,6 @@ ifneq ($(words $(SOURCE)),0)
 include $(MANPAGE_H)
 endif
 
-# Debian Doc SGML Documents
-SOURCE := $(wildcard *.$(LC).sgml)
-DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8
-include $(DEBIANDOC_H)
+# DocBook XML Documents
+SOURCE := $(wildcard *.$(LC).dbk)
+include $(DOCBOOK_H)