Просмотр исходного кода

* buildlib/debiandoc.mak, buildlib/po4a_manpage.mak:
- ensure that the build fails if documentation building fails

David Kalnischkies лет назад: 16
Родитель
Сommit
b6d189cab7
3 измененных файлов с 6 добавлено и 4 удалено
  1. 2 2
      buildlib/debiandoc.mak
  2. 1 1
      buildlib/po4a_manpage.mak
  3. 3 1
      debian/changelog

+ 2 - 2
buildlib/debiandoc.mak

@@ -27,7 +27,7 @@ vpath %.sgml $(SUBDIRS)
 $(DOC)/%.html: %.sgml
 $(DOC)/%.html: %.sgml
 	echo Creating html for $< to $@
 	echo Creating html for $< to $@
 	-rm -rf $@
 	-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
 # Clean rule
 .PHONY: veryclean/html/$(LOCAL)
 .PHONY: veryclean/html/$(LOCAL)
@@ -48,7 +48,7 @@ veryclean: veryclean/text/$(LOCAL)
 vpath %.sgml $(SUBDIRS)
 vpath %.sgml $(SUBDIRS)
 $(DOC)/%.text: %.sgml
 $(DOC)/%.text: %.sgml
 	echo Creating text for $< to $@
 	echo Creating text for $< to $@
-	$(DEBIANDOC_TEXT) -O $< > $@
+	$(DEBIANDOC_TEXT) -O $< > $@ || exit 198
 
 
 # Clean rule
 # Clean rule
 .PHONY: veryclean/text/$(LOCAL)
 .PHONY: veryclean/text/$(LOCAL)

+ 1 - 1
buildlib/po4a_manpage.mak

@@ -27,7 +27,7 @@ veryclean: veryclean/$(LOCAL)
 
 
 $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
 $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
 	echo Creating man page $@
 	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
 	test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed
 	mv -f $(subst .$(LC),,$@) $@
 	mv -f $(subst .$(LC),,$@) $@
 
 

+ 3 - 1
debian/changelog

@@ -12,8 +12,10 @@ apt (0.8.5) UNRELEASED; urgency=low
   * debian/control:
   * debian/control:
     - build-depend on docbook-xml to ensure that the xml DTDs are always
     - build-depend on docbook-xml to ensure that the xml DTDs are always
       available on the buildds (Closes: #597145)
       available on the buildds (Closes: #597145)
+  * buildlib/debiandoc.mak, buildlib/po4a_manpage.mak:
+    - ensure that the build fails if documentation building fails
 
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 17 Sep 2010 09:53:04 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 17 Sep 2010 10:01:45 +0200
 
 
 apt (0.8.4) unstable; urgency=low
 apt (0.8.4) unstable; urgency=low