build: rename build targets nmblookup -> nmblookup4 and nmblookup3 -> nmblookup

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index faf818ef536accd47451ac9b18b204383f6e874a..f67ba91598267074ea7d973bbbe002d822c307bd 100755 (executable)
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('cli-nbt',
                   private_library=True
                   )
 
-bld.SAMBA_BINARY('nmblookup',
+bld.SAMBA_BINARY('nmblookup' + bld.env.suffix4,
                  source='tools/nmblookup.c',
                  manpages='man/nmblookup.1',
                  deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE'

diff --git a/selftest/wscript b/selftest/wscript
index 494f5d8322a5f62d4bc6e93a58640cbbe2159e8a..563edfb5241957d7373a15c3af7f34a3a56f1a1d 100644 (file)
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -110,8 +110,8 @@ def cmd_testonly(opt):
         if o[0:1] != '_':
             os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
 
-    binary_mapping = ('nmblookup3:nmblookup3,' +
-                      'nmblookup4:nmblookup,' +
+    binary_mapping = ('nmblookup3:nmblookup,' +
+                      'nmblookup4:nmblookup4,' +
                       'smbclient3:smbclient3,' +
                       'smbtorture4:smbtorture,' + 
                       'ntlm_auth3:ntlm_auth3')

diff --git a/source3/wscript_build b/source3/wscript_build
index 02049e29ad9622575a3e85ca83869fb7a5a44f0e..2edfee9c0cfa71ac3f205ce19234c0a143a1d3d9 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1364,7 +1364,7 @@ bld.SAMBA3_BINARY('smbget',
                  smbclient''',
                  vars=locals())
 
-bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
+bld.SAMBA3_BINARY('nmblookup',
                  source=NMBLOOKUP_SRC,
                  deps='''
                  talloc