From f2eed65224bee9ebac0af2a56ef92e9cc5f4c049 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 9 Mar 2016 11:34:14 +1100 Subject: [PATCH] use xmlint to process include (cherry picked from commit 71e9df17b671f7ef5742967b25a1ab36ec3dd91b) --- doc/arm/Makefile.in | 9 ++++++--- make/rules.in | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in index e40a95b3e6..f3dd267dfb 100644 --- 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 5639af8faa..74b90a6e47 100644 --- a/make/rules.in +++ b/make/rules.in @@ -308,6 +308,7 @@ INSTALL_LIBRARY = @INSTALL_LIBRARY@ ### XSLTPROC = @XSLTPROC@ --novalid --xinclude --nonet +XMLLINT = @XMLLINT@ PERL = @PERL@ LATEX = @LATEX@ PDFLATEX = @PDFLATEX@