summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorThomas Nagy <tnagy@waf.io>2015-11-19 01:36:47 +0100
committerAndrew Bartlett <abartlet@samba.org>2015-11-24 05:00:27 +0100
commitcc4f7e393300d6a2ebcf19afbe0d9cb195320418 (patch)
tree377c65646f555cf75909bdca1f5bb3a7823c04a9 /docs-xml
parent22386dc39673f66de2dd57596447acf3c6c00ef7 (diff)
downloadsamba-cc4f7e393300d6a2ebcf19afbe0d9cb195320418.tar.gz
build:wafsamba: Specify whether node objects or flat lists in ant_glob
The changes enable the ant_glob declaration to be compatible with more recent versions of Waf. Signed-off-by: Thomas Nagy <tnagy@waf.io> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/wscript_build2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index d0e1051c550..2cff3c1f4e9 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -116,7 +116,7 @@ def smbdotconf_generate_parameter_list(task):
save_file(parameter_all, t , create_dir=True)
return 0
-articles = bld.path.ant_glob("smbdotconf/**/*.xml")
+articles = bld.path.ant_glob("smbdotconf/**/*.xml", flat=True)
parameter_all = 'smbdotconf/parameters.all.xml'
bld.SAMBA_GENERATOR(parameter_all,
source=articles,