s4/scripting: in MIT build do not install samba-tool, it is not usable yet

diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build
index 200562b1265177d491514f6bf2376e126caa5a07..e95fd03fc040c4359824fe770422b19b8e95a4b2 100644 (file)
--- a/source4/scripting/bin/wscript_build
+++ b/source4/scripting/bin/wscript_build
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
 if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
-    for script in ['samba_dnsupdate', 'samba_spnupdate', 'samba_kcc', 'upgradeprovision', 'samba_upgradedns']:
+    for script in ['samba-tool', 'samba_dnsupdate', 'samba_spnupdate', 'samba_kcc', 'upgradeprovision', 'samba_upgradedns']:
         bld.SAMBA_SCRIPT(script, pattern=script, installdir='.')
-
-bld.SAMBA_SCRIPT('samba-tool', pattern='samba-tool', installdir='.')

diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index 221f03086f40ea1c268d9affb92963574093ee6d..2362a642ff92094cab40145ace4e7014e84e0001 100644 (file)
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -3,18 +3,17 @@
 from samba_utils import MODE_755
 
 sbin_files = None
-bin_files = 'bin/samba-tool'
 if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
     sbin_files = 'bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns'
-    bin_files = bin_files + ' bin/samba_kcc'
 
 if sbin_files:
     bld.INSTALL_FILES('${SBINDIR}',
                       'bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns',
                       chmod=MODE_755, python_fixup=True, flat=True)
 
-bld.INSTALL_FILES('${BINDIR}',
-                  bin_files,
+if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
+    bld.INSTALL_FILES('${BINDIR}',
+                  'bin/samba-tool bin/samba_kcc',
                   chmod=MODE_755, python_fixup=True, flat=True)
 
 bld.RECURSE('bin')