-----Original Message-----
From: libvir-list-bounces(a)redhat.com
[mailto:libvir-list-bounces@redhat.com]
On Behalf Of taget(a)linux.vnet.ibm.com
Sent: Wednesday, December 04, 2013 12:46 PM
To: libvir-list(a)redhat.com
Subject: [libvirt] [PATCH] doc/Makefile.am: Add checking of XHTML1 DTD.
From: Eli Qiao <taget(a)linux.vnet.ibm.com>
When generating html from html.in, even not install xhtml1-dtds.noarch,
make
will not return a error.
which will lead 'make install' failed.
This patch return error when creating html doc when doning make, will give
user a correct error message.
Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com>
---
docs/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9de3406..bc42353 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -223,7 +223,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl
page.xsl sitemap.html.in
SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \
$(XMLLINT) --catalogs --nonet --format --valid $< > $(srcdir)/$@ \
|| { rm $(srcdir)/$@ && exit 1; }; \
- else echo "missing XHTML1 DTD" ; fi ; fi
+ else echo "missing XHTML1 DTD" && exit 1; fi ; fi
%.php.tmp: %.php.in site.xsl page.xsl sitemap.html.in
@if [ -x $(XSLTPROC) ] ; then \
@@ -249,7 +249,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl
sitemap.html.in
> /dev/null ; then \
SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \
$(XMLLINT) --catalogs --nonet --valid --noout
$(srcdir)/html/*.html ; \
- else echo "missing XHTML1 DTD" ; fi ; fi
+ else echo "missing XHTML1 DTD" && exit 1; fi ; fi
$(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml
$(devhelpxsl)
$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
--
FYI:
Your patch almost as same as:
http://www.redhat.com/archives/libvir-list/2013-October/msg00407.html
And Eric also point out:
http://www.redhat.com/archives/libvir-list/2013-October/msg00426.html
1.8.3.1
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list