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

diff --git a/xsl/webhelp/Makefile b/xsl/webhelp/Makefile
index 7489b2f4e5d81de8f6dc3c5c8d5532a476a4526c..5b75d4f620febb5fa19b0b57a97a91d6fbad0971 100644 (file)
--- a/xsl/webhelp/Makefile
+++ b/xsl/webhelp/Makefile
@@ -27,12 +27,12 @@ copyfiles:
        cp template/favicon.ico ${OUTPUT_DIR}/\r
 \r
 chunk:\r
-       xsltproc  --output  xincluded-profiled.xml  \\r
+       xsltproc  --xinclude --output  xincluded-profiled.xml  \\r
                   --stringparam  profile.os  "linux" \\r
                   ../profiling/profile.xsl  \\r
                   ${INPUT_XML}\r
 \r
-       xsltproc --xinclude xsl/webhelp.xsl xincluded-profiled.xml      \r
+       xsltproc xsl/webhelp.xsl xincluded-profiled.xml      \r
 \r
        rm xincluded-profiled.xml\r
 index:\r

diff --git a/xsl/webhelp/Makefile.sample b/xsl/webhelp/Makefile.sample
index b336d3f4ca2e1c8099c50da68c358187b7a687c3..185db103faf682727521f79741a298231003d7f3 100644 (file)
--- a/xsl/webhelp/Makefile.sample
+++ b/xsl/webhelp/Makefile.sample
@@ -69,7 +69,7 @@ copyfiles:
        cp template/favicon.ico ${OUTPUT_DIR}/\r
 \r
 chunk:\r
-       xsltproc  --output  xincluded-profiled.xml  \\r
+       xsltproc  --output --xinclude xincluded-profiled.xml  \\r
                   --stringparam  profile.arch ${PROFILE.ARCH} \\r
                   --stringparam  profile.audience ${PROFILE.AUDIENCE} \\r
                   --stringparam  profile.condition ${PROFILE.CONDITION} \\r
@@ -89,7 +89,7 @@ chunk:
                   ../profiling/profile.xsl  \\r
                   ${INPUT_XML}\r
 \r
-       xsltproc ${OTHER_XSLTPROC_ARGS} --xinclude xsl/webhelp.xsl xincluded-profiled.xml \r
+       xsltproc ${OTHER_XSLTPROC_ARGS} xsl/webhelp.xsl xincluded-profiled.xml \r
 \r
        rm xincluded-profiled.xml\r
 index:\r