From: David Cramer <david@thingbag.net>
Date: Sun, 23 Dec 2012 00:41:36 +0000 (+0000)
Subject: Webhelp: In Makefiles, do xinclude in first pass at document
X-Git-Tag: release/1.79.1~6^2~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6347c753da0e1322a2bf0b2cde46f114b01200a;p=docbook-dsssl

Webhelp: In Makefiles, do xinclude in first pass at document
---

diff --git a/xsl/webhelp/Makefile b/xsl/webhelp/Makefile
index 7489b2f4e..5b75d4f62 100644
--- a/xsl/webhelp/Makefile
+++ b/xsl/webhelp/Makefile
@@ -27,12 +27,12 @@ copyfiles:
 	cp template/favicon.ico ${OUTPUT_DIR}/
 
 chunk:
-	xsltproc  --output  xincluded-profiled.xml  \
+	xsltproc  --xinclude --output  xincluded-profiled.xml  \
                   --stringparam  profile.os  "linux" \
                   ../profiling/profile.xsl  \
                   ${INPUT_XML}
 
-	xsltproc --xinclude xsl/webhelp.xsl xincluded-profiled.xml      
+	xsltproc xsl/webhelp.xsl xincluded-profiled.xml      
 
 	rm xincluded-profiled.xml
 index:
diff --git a/xsl/webhelp/Makefile.sample b/xsl/webhelp/Makefile.sample
index b336d3f4c..185db103f 100644
--- a/xsl/webhelp/Makefile.sample
+++ b/xsl/webhelp/Makefile.sample
@@ -69,7 +69,7 @@ copyfiles:
 	cp template/favicon.ico ${OUTPUT_DIR}/
 
 chunk:
-	xsltproc  --output  xincluded-profiled.xml  \
+	xsltproc  --output --xinclude xincluded-profiled.xml  \
                   --stringparam  profile.arch ${PROFILE.ARCH} \
                   --stringparam  profile.audience ${PROFILE.AUDIENCE} \
                   --stringparam  profile.condition ${PROFILE.CONDITION} \
@@ -89,7 +89,7 @@ chunk:
                   ../profiling/profile.xsl  \
                   ${INPUT_XML}
 
-	xsltproc ${OTHER_XSLTPROC_ARGS} --xinclude xsl/webhelp.xsl xincluded-profiled.xml 
+	xsltproc ${OTHER_XSLTPROC_ARGS} xsl/webhelp.xsl xincluded-profiled.xml 
 
 	rm xincluded-profiled.xml
 index: