diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-23 12:07:29 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:11:42 +0200 |
commit | 204ffa441323adcdd5cc929e40d7194194329b1b (patch) | |
tree | b285eaf1be7924c70e99017b56e451a1546f3d69 /DOCS | |
parent | 1ba2cadb839810eac138e6cf45d6aac7a0bd6c2e (diff) | |
download | mpv-204ffa441323adcdd5cc929e40d7194194329b1b.tar.bz2 mpv-204ffa441323adcdd5cc929e40d7194194329b1b.tar.xz |
DOCS/xml: Get rid of xmllint wrapper redirection
Run commands directly from make.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31534 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/xml/Makefile | 7 | ||||
-rwxr-xr-x | DOCS/xml/configure | 14 |
2 files changed, 7 insertions, 14 deletions
diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index 01f935293d..e17ac2e8f3 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -1,12 +1,13 @@ # Makefile for generating the HTML documentation include ../../config.mak +include xml.mak # Generated HTML files go here. HTML = ../HTML MAIN_XML_ALL = $(foreach lang,$(DOC_LANG_ALL),$(lang)/main.xml) -CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh +CONFIGURE_GENERATED = html-chunk.xsl html-single.xsl xml.mak xsltproc.sh all: html-chunked html-single @@ -48,8 +49,8 @@ $(HTML)/$(lang)/index.html: $(HTML)/$(lang)/MPlayer.html: ./xsltproc.sh $$@ html-single.xsl $$< -xmllint-$(lang): $(lang)/main.xml - ./xmllint.sh $$< +xmllint-$(lang): + SGML_CATALOG_FILES=$(CATALOG) $(XMLLINT_COMMAND) $(lang)/main.xml endef $(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def))) diff --git a/DOCS/xml/configure b/DOCS/xml/configure index cc31b7880b..42f0a51054 100755 --- a/DOCS/xml/configure +++ b/DOCS/xml/configure @@ -4,7 +4,6 @@ # the other stuff necessary to convert the XML documentation. _xsltwrapper="xsltproc.sh" -_xmllintwrapper="xmllint.sh" echo "Searching for XML catalogs..." for _try_catalog in \ @@ -358,14 +357,7 @@ then _xmllint_command=true fi -cat > $_xmllintwrapper << EOF -#!/bin/sh -# ************************************************** -# This file is generated automatically. DO NOT EDIT. -# ************************************************** -# This is a small wrapper for XML lintian programs. -$_sgmlcatalog -$_xmllint_command +cat > xml.mak << EOF +CATALOG = $_catalog +XMLLINT_COMMAND = $_xmllint_command EOF - -chmod +x $_xmllintwrapper |