From: Björn Jacke Date: Mon, 25 Dec 2023 18:50:55 +0000 (+0100) Subject: docs-xml: use XML_CATALOG_FILES env var if defined X-Git-Tag: samba-4.18.10~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9862b23e000fc84fa910bab933db742f38abf20;p=thirdparty%2Fsamba.git docs-xml: use XML_CATALOG_FILES env var if defined Thanks to Thierry LARONDE for the fix. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15540 Signed-off-by: Björn Jacke Reviewed-by: Stefan Metzmacher (cherry picked from commit b9f32b32e0e1463b8ca3e696d682ecf86503464b) Autobuild-User(v4-18-test): Jule Anger Autobuild-Date(v4-18-test): Mon Jan 8 14:02:46 UTC 2024 on atb-devel-224 --- diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 17a188f5036..12b1bbcea96 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -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']