From 3e5d52776653aa2ae85420fe70aa1df6bc9d70e4 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 23 Apr 2015 13:40:17 +0200 Subject: [PATCH] docs: correctly depend on used xsl files and catalog for building manpages.t So changes in (e.g.) our man.xsl will trigger a rebuild of the manpages. Signed-off-by: Michael Adam Reviewed-by: Alexander Bokovoy Autobuild-User(master): Michael Adam Autobuild-Date(master): Fri Apr 24 15:39:31 CEST 2015 on sn-devel-104 --- buildtools/wafsamba/wafsamba.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index c423e6025ff..d7e482c75bc 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -886,7 +886,8 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None): '''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:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml' + bld.env.SAMBA_CATALOG = 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.env.SAMBA_CATALOG for m in manpages.split(): source = m + '.xml' @@ -896,6 +897,7 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None): source=source, target=m, group='final', + dep_vars=['SAMBA_MAN_XSL', 'SAMBA_EXPAND_XSL', 'SAMBA_CATALOG'], rule='''XML_CATALOG_FILES="${SAMBA_CATALOGS}" export XML_CATALOG_FILES ${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC[0].abspath(env)} -- 2.47.3