From: Eric Blake <eblake@redhat.com>
Date: Tue, 19 Jul 2011 13:34:34 +0000 (-0600)
Subject: build: detect doc generation failure
X-Git-Tag: v0.9.4-rc1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97ee0953c6b405f8a71d92172af9b45d95c4407b;p=thirdparty%2Flibvirt.git

build: detect doc generation failure

Commit 8665f85 introduced a slight regression in doc generation,
since make only quits a rule on the first failed command ending
with a newline rather than a semicolon.

* docs/Makefile.am (html/index.html): Don't use xmllint unless
xsltproc succeeded.
* .gitignore: Ignore recently updated stamp file name.
---

diff --git a/.gitignore b/.gitignore
index 1bfb7b9bde..486e1028ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@
 /mkinstalldirs
 /po/*
 /proxy/
+/python/generator.py.stamp
 /src/libvirt_iohelper
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4ba6b9d59d..de649fe5c9 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -155,7 +155,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
 	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
 	  $(XSLTPROC) --nonet -o $(srcdir)/ \
-	  $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi ; \
+	  $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \
 	if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
 	  if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \
 	    > /dev/null ; then \