Author: diego Date: Wed Jun 23 15:36:02 2010 New Revision: 31538 Log: Get rid of xsltproc wrapper redirection; run commands directly from make. Modified: trunk/DOCS/xml/Makefile trunk/DOCS/xml/configure Changes in other areas also in this revision: Modified: trunk/DOCS/xml/ (props changed) Modified: trunk/DOCS/xml/Makefile ============================================================================== --- trunk/DOCS/xml/Makefile Wed Jun 23 15:24:53 2010 (r31537) +++ trunk/DOCS/xml/Makefile Wed Jun 23 15:36:02 2010 (r31538) @@ -7,7 +7,7 @@ include xml.mak HTML = ../HTML MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) -CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xml.mak xsltproc.sh +CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xml.mak all: html-chunked html-single @@ -44,10 +44,10 @@ $(HTML)/$(lang)/default.css: cp -f default.css $$(@D) $(HTML)/$(lang)/dummy.html: - ./xsltproc.sh $$@ html-chunk.xsl $$< + SGML_CATALOG_FILES=$(CATALOG) $(XSLT_COMMAND) $$@ html-chunk.xsl $$< $(HTML)/$(lang)/MPlayer.html: - ./xsltproc.sh $$@ html-single.xsl $$< + SGML_CATALOG_FILES=$(CATALOG) $(XSLT_COMMAND) $$@ html-single.xsl $$< xmllint-$(lang): SGML_CATALOG_FILES=$(CATALOG) $(XMLLINT_COMMAND) $(lang)/main.xml Modified: trunk/DOCS/xml/configure ============================================================================== --- trunk/DOCS/xml/configure Wed Jun 23 15:24:53 2010 (r31537) +++ trunk/DOCS/xml/configure Wed Jun 23 15:36:02 2010 (r31538) @@ -3,8 +3,6 @@ # Script to check for catalogs, stylesheets, XSL processors and all # the other stuff necessary to convert the XML documentation. -_xsltwrapper="xsltproc.sh" - echo "Searching for XML catalogs..." for _try_catalog in \ /etc/sgml/catalog \ @@ -29,7 +27,6 @@ done if test -n "$_catalog" then echo "Found SGML catalog at $_catalog" - _sgmlcatalog="export SGML_CATALOG_FILES=$_catalog" else echo "No SGML catalog found." fi @@ -183,9 +180,9 @@ then echo "Found xsltproc. If it works, it's probably the best choice." if test -n "$_catalog" then - _xsltcommand="xsltproc --catalogs -o \$1 \$2 \$3" + _xsltcommand="xsltproc --catalogs -o \$\$1 \$\$2 \$\$3" else - _xsltcommand="xsltproc -o \$1 \$2 \$3" + _xsltcommand="xsltproc -o \$\$1 \$\$2 \$\$3" fi else echo "Found xsltproc but no stylesheets on your system." @@ -194,22 +191,6 @@ then fi - -cat > $_xsltwrapper << EOF -#!/bin/sh -# ************************************************** -# This file is generated automatically. DO NOT EDIT. -# ************************************************** -# This is a small wrapper script around many ways to call the XSLT processor. -# It accepts 3 arguments: <output_dir> <stylesheet_name> <main XML file name> - -$_sgmlcatalog -$_xsltcommand -EOF - -chmod +x $_xsltwrapper - - echo "Searching for XML checker..." for _try_xmllint in xmllint do @@ -235,4 +216,5 @@ fi cat > xml.mak << EOF CATALOG = $_catalog XMLLINT_COMMAND = $_xmllint_command +XSLT_COMMAND = $_xsltcommand EOF