build:wafsamba: Install named.conf only once
authorThomas Nagy <tnagy@waf.io>
Sun, 8 Nov 2015 17:50:55 +0000 (18:50 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 16 Nov 2015 10:48:14 +0000 (11:48 +0100)
The wildcard *.conf already lists named.conf. Adding files
more than once will cause unnecessary rebuilds and raise
errors in later Waf versions.

Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
source4/setup/wscript_build

index cb83e3e2462b4e43c235f6055a837d18eedd8f8b..2717986aa086f3a3581916f406915b9abf0a094b 100644 (file)
@@ -7,6 +7,6 @@ bld.INSTALL_FILES('${SETUPDIR}', 'dns_update_list')
 bld.INSTALL_FILES('${SETUPDIR}', 'spn_update_list')
 
 for p in '''schema-map-* DB_CONFIG *.inf *.ldif *.reg *.zone *.conf *.php *.txt
-            named.conf named.conf.update named.conf.dlz'''.split():
+            named.conf.update named.conf.dlz'''.split():
     bld.INSTALL_WILDCARD('${SETUPDIR}', p)