Mercurial > mplayer.hg

changeset 34215:70e6cffc6bb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Merge DOCS/xml/xml.mak into config.mak.
author diego
date Sat, 05 Nov 2011 16:35:50 +0000
parents ecb63dcc272c
children 66cdad95f543
files DOCS/xml/Makefile configure
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/Makefile	Sat Nov 05 13:47:51 2011 +0000
+++ b/DOCS/xml/Makefile	Sat Nov 05 16:35:50 2011 +0000
@@ -1,7 +1,6 @@
 # Makefile for generating the HTML documentation
 
 include ../../config.mak
-include xml.mak
 
 # Generated HTML files go here.
 HTML = ../HTML
--- a/configure	Sat Nov 05 13:47:51 2011 +0000
+++ b/configure	Sat Nov 05 16:35:50 2011 +0000
@@ -7930,12 +7930,6 @@
   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 @@
 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