use xmlint to process include

(cherry picked from commit 71e9df17b671f7ef5742967b25a1ab36ec3dd91b)

diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index e40a95b3e63370c29c687ba58e3794e2a0439cb4..f3dd267dfb12e4a3f81b617b98d4209d26a0403a 100644 (file)
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -39,21 +39,24 @@ maintainer-clean distclean::
        rm -f pkgversion.xml
        rm -f noteversion.xml
 
+# use xmllint to process include
 notes.html: notes-wrapper.xml notes.xml releaseinfo.xml pkgversion.xml noteversion.xml
-       expand notes-wrapper.xml | \
+       expand notes-wrapper.xml | ${XMLLINT} --xinclude - | \
        ${XSLTPROC} --stringparam generate.toc "" ../xsl/isc-notes-html.xsl - > notes.html
 
 notes.pdf: notes-wrapper.xml notes.xml releaseinfo.xml pkgversion.xml noteversion.xml
        ${XSLTPROC} ${top_srcdir}/doc/xsl/pre-latex.xsl notes-wrapper.xml | \
        ${DBLATEX} -c notes.conf -Pdoc.layout="mainmatter" -o notes.pdf -
 
+# use xmllint to process include
 Bv9ARM.html: Bv9ARM-book.xml releaseinfo.xml pkgversion.xml noteversion.xml
-       expand Bv9ARM-book.xml | \
+       expand Bv9ARM-book.xml | ${XMLLINT} --xinclude - | \
        ${XSLTPROC} --stringparam root.filename Bv9ARM \
                ${top_srcdir}/doc/xsl/isc-docbook-chunk.xsl -
 
+# use xmllint to process include
 Bv9ARM-all.html: Bv9ARM-book.xml releaseinfo.xml pkgversion.xml noteversion.xml
-       expand Bv9ARM-book.xml | \
+       expand Bv9ARM-book.xml | ${XMLLINT} --xinclude - |\
        ${XSLTPROC} -o Bv9ARM-all.html ../xsl/isc-docbook-html.xsl -
 
 Bv9ARM.pdf: Bv9ARM-book.xml releaseinfo.xml pkgversion.xml noteversion.xml

diff --git a/make/rules.in b/make/rules.in
index 335bf90900c5aae17160058703c92c9619c89640..4f299aefe9d6dc32e20fd60b23ad4d2eaaeac518 100644 (file)
--- a/make/rules.in
+++ b/make/rules.in
@@ -311,6 +311,7 @@ INSTALL_LIBRARY =   @INSTALL_LIBRARY@
 ###
 
 XSLTPROC =             @XSLTPROC@ --novalid --xinclude --nonet
+XMLLINT =              @XMLLINT@
 PERL =                 @PERL@
 LATEX =                        @LATEX@
 PDFLATEX =             @PDFLATEX@