From: David Kalnischkies Date: Fri, 17 Sep 2010 08:02:38 +0000 (+0200) Subject: * buildlib/debiandoc.mak, buildlib/po4a_manpage.mak: X-Git-Tag: 0.8.5~1^2~2 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b6d189cab739eb23fc8d86c051b4081d52705ab0?hp=6422a70461fe89041d6112fed831b1c07cd45a3f * buildlib/debiandoc.mak, buildlib/po4a_manpage.mak: - ensure that the build fails if documentation building fails --- diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak index f33474107..a97af0caf 100644 --- a/buildlib/debiandoc.mak +++ b/buildlib/debiandoc.mak @@ -27,7 +27,7 @@ vpath %.sgml $(SUBDIRS) $(DOC)/%.html: %.sgml echo Creating html for $< to $@ -rm -rf $@ - (HERE=`pwd`; cd $(@D) && $(DEBIANDOC_HTML) $(DEBIANDOC_HTML_OPTIONS) $$HERE/$<) + (HERE=`pwd`; cd $(@D) && $(DEBIANDOC_HTML) $(DEBIANDOC_HTML_OPTIONS) $$HERE/$<) || exit 199 # Clean rule .PHONY: veryclean/html/$(LOCAL) @@ -48,7 +48,7 @@ veryclean: veryclean/text/$(LOCAL) vpath %.sgml $(SUBDIRS) $(DOC)/%.text: %.sgml echo Creating text for $< to $@ - $(DEBIANDOC_TEXT) -O $< > $@ + $(DEBIANDOC_TEXT) -O $< > $@ || exit 198 # Clean rule .PHONY: veryclean/text/$(LOCAL) diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 6eec9d031..11dc11d28 100644 --- 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),,$@) $@ diff --git a/debian/changelog b/debian/changelog index 7e70d16db..75ac29a71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,10 @@ apt (0.8.5) UNRELEASED; urgency=low * debian/control: - build-depend on docbook-xml to ensure that the xml DTDs are always available on the buildds (Closes: #597145) + * buildlib/debiandoc.mak, buildlib/po4a_manpage.mak: + - ensure that the build fails if documentation building fails - -- David Kalnischkies Fri, 17 Sep 2010 09:53:04 +0200 + -- David Kalnischkies Fri, 17 Sep 2010 10:01:45 +0200 apt (0.8.4) unstable; urgency=low