diff options
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 3 | ||||
| -rwxr-xr-x | wscript_build | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 64624d71d5..50c3f36a82 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -774,13 +774,14 @@ Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS def MANPAGES(bld, manpages): '''build and install manual pages''' bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' + os.environ["XML_CATALOG_FILES"] = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml' for m in manpages.split(): source = m + '.xml' bld.SAMBA_GENERATOR(m, source=source, target=m, group='final', - rule='${XSLTPROC} -o ${TGT} --nonet ${MAN_XSL} ${SRC}' + rule='${XSLTPROC} --xinclude -o ${TGT} --nonet ${MAN_XSL} ${SRC}' ) bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True) Build.BuildContext.MANPAGES = MANPAGES diff --git a/wscript_build b/wscript_build index b671699344..8c96b5c50e 100755 --- a/wscript_build +++ b/wscript_build @@ -143,3 +143,7 @@ bld.RECURSE('testsuite/headers') bld.SYMBOL_CHECK() bld.DUP_SYMBOL_CHECK() + +bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/docs-xml' +bld.CONFIGURE_FILE('docs-xml/build/catalog.xml', + ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR) |