Excluding index.html from search index generation

ws/Docbook/Extensions/Tdata/Makefile

@@ -55,6 +55,12 @@ webhelp.base.dir=target/webhelp
 DIR := ${CURDIR}
 numCores=$(shell nproc --all)
 
+# Required for docbook Xsl 1.0 based stylesheets
+SAXON6CMD=java -cp "/usr/share/java/saxon.jar:/usr/share/java/xslthl-2.1.3.jar" \
+          '-Dxslthl.config=file://${DBOOK_XSL}/highlighting/xslthl-config.xml' \
+          com.icl.saxon.StyleSheet
+
+# XSL 2.0 processor
 SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xslthl-2.1.3.jar" \
 -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
     -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
@@ -80,10 +86,7 @@ ${BUILDROOT_SRC}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml
 	cd  ${BUILDROOT_SRC}/Resources; $(MAKE) -f ../make.image; rm -rf `find . -name Generate`
 
 webhelp:${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
-	java -cp "/usr/share/java/saxon.jar:/usr/share/java/xslthl-2.1.3.jar" \
-          '-Dxslthl.config=file://${DBOOK_XSL}/highlighting/xslthl-config.xml' \
-          com.icl.saxon.StyleSheet \
-            ${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml ${DBOOK_XSL_CUSTOM}/webhelp/webhelpHdm.xsl ${dbookXslWebhelpParam}
+	${SAXON6CMD} ${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml ${DBOOK_XSL_CUSTOM}/webhelp/webhelpHdm.xsl ${dbookXslWebhelpParam}
 	cd ${BUILDROOT_SRC}/Resources; rsync -av * ${DIR}/${BUILDROOT_WEBHELP}
 	cp -r ${DBOOK_XSL}/webhelp/template/* ${BUILDROOT_WEBHELP}     # Images, Css
 	cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> ${BUILDROOT_WEBHELP}/common/css/positioning.css  # highlighting supplements
@@ -97,17 +100,14 @@ webhelp:${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
           '-DhtmlExtension=html' \
           '-DdoStem=true' \
           '-DtocFile=$${toc.file}' \
-          '-DindexerExcludedFiles=ix01.html' \
+          '-DindexerExcludedFiles=index.html' \
           '-Dorg.xml.sax.driver=org.ccil.cowan.tagsoup.Parser' \
           '-Djavax.xml.parsers.SAXParserFactory=org.ccil.cowan.tagsoup.jaxp.SAXFactoryImpl' \
           -cp '${DBOOK_XSL}/extensions/webhelpindexer.jar:${DBOOK_XSL}/extensions/lucene-analyzers-3.0.0.jar:${DBOOK_XSL}/extensions/lucene-core-3.0.0.jar:${DBOOK_XSL}/extensions/tagsoup-1.2.1.jar' \
            com.nexwave.nquindexer.IndexerMain
 
 epub: ${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
-	java -cp "/usr/share/java/saxon.jar:/usr/share/java/xslthl-2.1.3.jar" \
-          '-Dxslthl.config=file://${DBOOK_XSL}/highlighting/xslthl-config.xml' \
-          com.icl.saxon.StyleSheet \
-          $< ${DBOOK_XSL_CUSTOM}/epub/chunkHdm.xsl ${dbookXslEpubParam}
+	${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/epub/chunkHdm.xsl ${dbookXslEpubParam}
 	rsync -av --delete ${BUILDROOT_SRC}/Resources/* ${BUILDROOT_EPUB}/OEBPS
 	rsync -av --delete ${DBOOK_XSL}/images ${BUILDROOT_EPUB}/OEBPS     # Images, Css
 	cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> ${BUILDROOT_EPUB}/OEBPS/docbook-epub.css # highlighting supplements