[MPlayer-cvslog] r34303 - in trunk: DOCS/xml DOCS/xml/Makefile configure

[diego]

Author: diego
Date: Sat Nov  5 17:35:50 2011
New Revision: 34303

Log:
build: Merge DOCS/xml/xml.mak into config.mak.

Modified:
   trunk/DOCS/xml/   (props changed)
   trunk/configure

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/xml/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sat Nov  5 14:47:51 2011	(r34302)
+++ trunk/configure	Sat Nov  5 17:35:50 2011	(r34303)
@@ -7930,12 +7930,6 @@ if xsltproc --version > /dev/null 2>&1; 
   fi
 fi
 
-cat > DOCS/xml/xml.mak << EOF
-CATALOG = $catalog
-XMLLINT_COMMAND = xmllint --noout --noent --postvalid $catalog_opts \$*
-XSLT_COMMAND = $xsltcommand
-EOF
-
 #############################################################################
 
 mak_enable () {
@@ -7965,6 +7959,10 @@ DOC_LANG_ALL = $doc_lang_all
 MAN_LANGS = $language_man
 MAN_LANG_ALL = $man_lang_all
 
+CATALOG = $catalog
+XMLLINT_COMMAND = xmllint --noout --noent --postvalid $catalog_opts \$*
+XSLT_COMMAND = $xsltcommand
+
 prefix  = \$(DESTDIR)$_prefix
 BINDIR  = \$(DESTDIR)$_bindir
 DATADIR = \$(DESTDIR)$_datadir