From 445c846df02f43fa16937d31d5bf7969dec4d219 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 23 Jun 2010 13:24:53 +0000 Subject: DOCS/xml: Move xsltproc target file hack to the Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31537 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/Makefile | 8 ++++---- DOCS/xml/configure | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/Makefile b/DOCS/xml/Makefile index e17ac2e8f3..7517d7a206 100644 --- a/DOCS/xml/Makefile +++ b/DOCS/xml/Makefile @@ -35,16 +35,16 @@ $(CONFIGURE_GENERATED) $(MAIN_XML_ALL): ./configure define lang-def -html-chunked-$(lang): $(HTML)/$(lang)/index.html +html-chunked-$(lang): $(HTML)/$(lang)/dummy.html html-single-$(lang): $(HTML)/$(lang)/MPlayer.html -$(HTML)/$(lang)/index.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css +$(HTML)/$(lang)/dummy.html $(HTML)/$(lang)/MPlayer.html: $(lang)/main.xml $(wildcard $(lang)/*.xml) html-common.xsl $(HTML)/$(lang)/default.css $(HTML)/$(lang)/default.css: mkdir -p $$(@D) cp -f default.css $$(@D) -$(HTML)/$(lang)/index.html: - ./xsltproc.sh $$(@D)/ html-chunk.xsl $$< +$(HTML)/$(lang)/dummy.html: + ./xsltproc.sh $$@ html-chunk.xsl $$< $(HTML)/$(lang)/MPlayer.html: ./xsltproc.sh $$@ html-single.xsl $$< diff --git a/DOCS/xml/configure b/DOCS/xml/configure index eb43e5d7c9..73fae4b5d2 100755 --- a/DOCS/xml/configure +++ b/DOCS/xml/configure @@ -181,13 +181,11 @@ then if test -z "$_fake_chunk_xsl" then echo "Found xsltproc. If it works, it's probably the best choice." - # HACK: xslt always need a target file if a doctype is set - _xsltcommand="OUTPUT=\"\$1\"; if test -d \"\$OUTPUT\" ; then OUTPUT=\"\$OUTPUT/dummy.html\" ; fi;" if test -n "$_catalog" then - _xsltcommand="$_xsltcommand xsltproc --catalogs -o \$OUTPUT \$2 \$3" + _xsltcommand="xsltproc --catalogs -o \$1 \$2 \$3" else - _xsltcommand="$_xsltcommand xsltproc -o \$OUTPUT \$2 \$3" + _xsltcommand="xsltproc -o \$1 \$2 \$3" fi else echo "Found xsltproc but no stylesheets on your system." -- cgit v1.2.3