]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
docs-xml: use XML_CATALOG_FILES env var if defined
authorBjörn Jacke <bjacke@samba.org>
Mon, 25 Dec 2023 18:50:55 +0000 (19:50 +0100)
committerJule Anger <janger@samba.org>
Mon, 8 Jan 2024 14:02:46 +0000 (14:02 +0000)
Thanks to Thierry LARONDE for the fix.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15540

Signed-off-by: Björn Jacke <bjacke@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit b9f32b32e0e1463b8ca3e696d682ecf86503464b)

Autobuild-User(v4-18-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-18-test): Mon Jan  8 14:02:46 UTC 2024 on atb-devel-224

buildtools/wafsamba/wafsamba.py

index 17a188f5036487e67cd8dfa6f6289d1f452fb82e..12b1bbcea96732d8fbad780142e3ee8685265b7d 100644 (file)
@@ -1181,7 +1181,7 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None):
     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_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml'
-    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG
+    bld.env.SAMBA_CATALOGS = os.getenv('XML_CATALOG_FILES', 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog') + ' file://' + bld.env.SAMBA_CATALOG
 
     for m in manpages.split():
         source = [m + '.xml']