merged from debian-sid branch

[apt.git] / buildlib / po4a_manpage.mak

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 3d90c6ba498d4256d2b39cfe8ab8036e47497e83..11dc11d28925a9d2125c2f19a51542956b352c24 100644 (file)
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -27,7 +27,7 @@ veryclean: veryclean/$(LOCAL)
 
 $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
        echo Creating man page $@
-       $(XSLTPROC) -o $@ $(STYLESHEET) $< # why xsltproc doesn't respect the -o flag here???
+       $(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
        mv -f $(subst .$(LC),,$@) $@
 
@@ -35,7 +35,8 @@ $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
 .PHONY: veryclean/$(LOCAL)
 veryclean/$(LOCAL):
        -rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \
-               $(addsuffix .xml,$($(@F)-LIST))
+               $(addsuffix .xml,$($(@F)-LIST)) \
+               offline.$(LC).sgml guide.$(LC).sgml
 
 HAVE_PO4A=yes
 endif
@@ -56,5 +57,5 @@ endif
 
 # Debian Doc SGML Documents
 SOURCE := $(wildcard *.$(LC).sgml)
-DEBIANDOC_HTML_OPTIONS=-l $(LC)
+DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8
 include $(DEBIANDOC_H)