diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-23 13:36:02 +0000 |
|---|---|---|
| committer |  Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:11:42 +0200 |
| commit | f5e3179c4008d0816c7500922d4e2f8d24296d6b (patch) | |
| tree | d1f140bc53df47478ac4238efdc9b82af74425e2 | |
| parent | 445c846df02f43fa16937d31d5bf7969dec4d219 (diff) | |
DOCS/xml: Get rid of xsltproc wrapper redirection
Run commands directly from make.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31538 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/xml/Makefile | 6 | ||||
| -rwxr-xr-x | DOCS/xml/configure | 24 |
2 files changed, 6 insertions, 24 deletions
diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 7517d7a206..6e68d905e8 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -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 diff --git a/DOCS/xml/configure b/DOCS/xml/configure index 73fae4b5d2..7e262b7de0 100755 --- a/DOCS/xml/configure +++ b/DOCS/xml/configure @@ -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 |