Correcting saxon's flawed xi:include behaviour

Doc/Makefile

@@ -13,6 +13,12 @@ BUILDROOT=/tmp
 
 #+++ no changes below this line ++++++++++++++++++++++++++++++++++++
 
+SAXONCMD=java -cp "/usr/share/java/Saxon-HE.jar:/usr/share/java/xercesImpl.jar" \
+-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
+    -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
+    -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration \
+   net.sf.saxon.Transform 
+
 #
 # Directories containing pom.xml files
 #
@@ -22,8 +28,8 @@ BUILDROOT=/tmp
 #
 BUILDROOT=target
 BUILDBASE=$(BUILDROOT)/$(SCRIPTBASENAME)
-BUILDNAVI=$(BUILDBASE)/navi/$(PLUGINID)
-BUILDNONAVI=$(BUILDBASE)/nonavi/$(PLUGINID)
+BUILDNAVI=navi/$(PLUGINID)
+BUILDNONAVI=nonavi/$(PLUGINID)
 JAVADOCDESTDIR=${BUILDNAVI}/Ref/api
 
 #jdoc: $(foreach pomDir,$(POMDIRS),$(pomDir)/jdoc )
@@ -32,26 +38,29 @@ all: ${BUILDNAVI}/printversion.pdf
 
 ${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml  Common/glossary.xml Common/bibliography.xml
 	mkdir -p ${BUILDROOT};
-	saxon9he-xslt -s:${SCRIPTBASENAME}.xml -xi:on -xsl:../ws/Docbook/Extensions/Xsl/docbook2docbook.xsl >  ${BUILDROOT}/${SCRIPTBASENAME}.xml
+	${SAXONCMD} -s:${SCRIPTBASENAME}.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2docbook.xsl >  ${BUILDROOT}/${SCRIPTBASENAME}.xml
 	for module in ${DOCMODULES}; do \
             tar c- $$module/Ref| tar -x -C ${BUILDROOT}; \
           done;
-	cd  ${BUILDROOT}; mkdir -p ${BUILDNAVI} ${BUILDNONAVI};\
+	cd  ${BUILDROOT}; mkdir -p ${BUILDNONAVI};\
           /usr/share/xmlmind/bin/xxetool convert -p suppress.navigation 1 -p eclipse.plugin.id  $(PLUGINID) ${PPARAM} db5.toEclipseHelp \
-          ${SCRIPTBASENAME}.xml -u $(BUILDNONAVI)
-#	/usr/share/xmlmind/bin/xxetool convert -p eclipse.plugin.id  $(PLUGINID) ${PPARAM} db5.toEclipseHelp  ${SCRIPTBASENAME}.answer.xml -u $(BUILDNAVI)
-#	perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml ${BUILDNONAVI}/*.xml
-#	/usr/share/xmlmind/bin/xxetool convert db5.toPSFile  ${SCRIPTBASENAME}.answer.xml \
-#               -s pdf -s "|pdf" -u  $(BUILDNAVI)/printversion.pdf
+          ${SCRIPTBASENAME}.xml -u $(BUILDNONAVI);
+	cd  ${BUILDROOT}; mkdir -p ${BUILDNAVI};\
+          /usr/share/xmlmind/bin/xxetool convert -p eclipse.plugin.id  $(PLUGINID) ${PPARAM} db5.toEclipseHelp  ${SCRIPTBASENAME}.xml -u $(BUILDNAVI);\
+          perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml ${BUILDNONAVI}/*.xml;
+	cd ${BUILDROOT};\
+          /usr/share/xmlmind/bin/xxetool convert db5.toPSFile  ${SCRIPTBASENAME}.xml \
+          -s pdf -s "|pdf" -u  $(BUILDNAVI)/printversion.pdf
+
 #	tar c --exclude=\.svn Ref|tar -xC ${BUILDNAVI}
 
 
-post:
-	 cd ${BUILDROOT};\
-           for module in ${DOCMODULES}; do \
-             mkdir -p  $$module/Ref/Fig/Generate;rm -f $$module/Ref/Fig/Generate/*.tex;\
-             ../../bin/stripUnicode.sh resources/Generate/*.tex; mv resources/Generate/*.tex Ref/Fig/Generate
-           done;
+#post:#
+#	 cd ${BUILDROOT};\
+#          for module in ${DOCMODULES}; do \
+#            mkdir -p  $$module/Ref/Fig/Generate;rm -f $$module/Ref/Fig/Generate/*.tex;\
+#            ../../bin/stripUnicode.sh resources/Generate/*.tex; mv resources/Generate/*.tex Ref/Fig/Generate
+#          done;