From 649635661509b211242fc99aa7ae4d2abbc62f9f Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Mon, 15 Oct 2012 07:33:40 +0300
Subject: [PATCH] Fix docs-xml/Makefile to set XML_CATALOG_FILES by default

Ensure XML_CATALOG_FILES set by default in the environment
that runs documentation build, both in docs-xml/Makefile build
and in waf build. This should fix problems people see in various
environments with docs-xml/Makefile build when not reading
docs-xml/build/README.

We now set XML_CATALOG_FILES to predefined set of /etc/xml/catalog and
our own local catalog (docs-xml/build/catalog.xml for Makefile build)
unless the variable is already defined in the environment where make
runs.
---
 buildtools/wafsamba/wafsamba.py | 8 ++++----
 docs-xml/Makefile.settings.in   | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 59d3a2c02f939a61545116ca6174a9965880d666..2a034e9aeda001983cacb61e2b331b0b9a3f8787 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -785,21 +785,21 @@ def MANPAGES(bld, manpages):
         bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
 Build.BuildContext.MANPAGES = MANPAGES
 
+
 def SAMBAMANPAGES(bld, manpages):
     '''build and install manual pages'''
     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
     bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+    bld.env['env'] = dict(XML_CATALOG_FILES = bld.env.SAMBA_CATALOGS)
     for m in manpages.split():
         source = m + '.xml'
         bld.SAMBA_GENERATOR(m,
                             source=source,
                             target=m,
                             group='final',
-                            rule='''export XML_CATALOG_FILES="${SAMBA_CATALOGS}"
-                                    ${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC}
-                                    ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'''
-                            )
+                            rule='''${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC}
+                                    ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml''')
         bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
 Build.BuildContext.SAMBAMANPAGES = SAMBAMANPAGES
 
diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index 2bf96d746bc587cac959c5c542629da24b1b4f47..b8c23ac236b277d2a88e7d03afdb29b3c9efef31 100644
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -30,3 +30,7 @@ PLUCKERDIR=$(OUTPUTDIR)/plucker
 DB2LATEX_ARGS = --stringparam latex.documentclass.book @LATEX_DOCUMENTCLASS_OPTIONS@
 
 TARGETS = @TARGETS@
+
+XML_CATALOG_FILES ?= file:///etc/xml/catalog file://@abs_top_builddir@/build/catalog.xml
+export XML_CATALOG_FILES
+
-- 
1.7.12