summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2012-12-20 10:01:43 +0100
committerMichael Adam <obnox@samba.org>2013-01-15 14:49:19 +0100
commitd61d2af3727a19cc4ddc88ec2faa8aafff9c7422 (patch)
tree93ebe8f00f3d3d52037e254ded7afb0eadfd15b4 /buildtools/wafsamba
parent07660ac01acf4fd4b03436dd0f597a246948a590 (diff)
downloadsamba-d61d2af3727a19cc4ddc88ec2faa8aafff9c7422.tar.gz
samba-d61d2af3727a19cc4ddc88ec2faa8aafff9c7422.tar.bz2
samba-d61d2af3727a19cc4ddc88ec2faa8aafff9c7422.zip
wafsamba: use additional xml catalog file (bug #9512)
Add additional "/usr/local/share/xml/catalog" catalog file platforms (used by freebsd). Fix manual page build on freebsd. Signed-off-by: Björn Baumbach <bb@sernet.de> Reviewed-by: Michael Adam <obnox@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/wafsamba.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 6ef0b570d9..dcbb04704a 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -790,7 +790,8 @@ 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.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/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,