s4-waf: removed the unused installdir= option to SAMBA_BINARY()

This was left over from the automatic conversion of the config.mk
files

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1714718c36bdbf03c25a169be0701264f3e5cc4c..a750a161c9dbba8f418dd2d84aa2dbaf867746be 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -212,7 +212,6 @@ def SAMBA_BINARY(bld, binname, source,
                  public_headers=None,
                  header_path=None,
                  modules=None,
-                 installdir=None,
                  ldflags=None,
                  cflags='',
                  autoproto=None,

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index b85a5d7090217c23acedcad4a5e69c432e33c625..726b4c838c70215d3768d65d08b378fc79174cc6 100644 (file)
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -16,7 +16,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_NBT',
 bld.SAMBA_BINARY('nmblookup',
        source='tools/nmblookup.c',
        manpages='man/nmblookup.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBCLI_NBT popt POPT_SAMBA LIBNETIF LIBCLI_RESOLVE'
        )
 

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 90c527b2eb8ae9949a9f8eae94a21acbc572ec57..e13b4dc40223e1fa682e3cba515eae9758cd4768 100644 (file)
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -9,14 +9,12 @@ bld.SAMBA_SUBSYSTEM('LIBWINBIND-CLIENT',
 
 bld.SAMBA_BINARY('nsstest',
        source='nsstest.c',
-       installdir='BINDIR',
        deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
        )
 
 
 bld.SAMBA_BINARY('wbinfo',
        source='wbinfo.c',
-       installdir='BINDIR',
        deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER'
        )
 

diff --git a/source4/client/wscript_build b/source4/client/wscript_build
index 08dc90c961d67b77ca83363fb9c288cae190a572..d35b6a8fca3817e05f2ba55f9ec60bbac693e331 100644 (file)
--- a/source4/client/wscript_build
+++ b/source4/client/wscript_build
@@ -2,14 +2,12 @@
 
 bld.SAMBA_BINARY('smbclient',
        source='client.c',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG SMBREADLINE LIBSAMBA-UTIL LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_RAW'
        )
 
 
 bld.SAMBA_BINARY('cifsdd',
        source='cifsdd.c cifsddio.c',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS'
        )
 

diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build
index 66f2aa86d57dad8f8cb3849bf581141eda69218f..1b34f7963f9a27625dc6f73f39f38a45f37f06e5 100644 (file)
--- a/source4/lib/registry/wscript_build
+++ b/source4/lib/registry/wscript_build
@@ -29,7 +29,6 @@ bld.SAMBA_SUBSYSTEM('registry_common',
 bld.SAMBA_BINARY('regdiff',
        source='tools/regdiff.c',
        manpages='man/regdiff.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG registry popt POPT_SAMBA POPT_CREDENTIALS'
        )
 
@@ -37,7 +36,6 @@ bld.SAMBA_BINARY('regdiff',
 bld.SAMBA_BINARY('regpatch',
        source='tools/regpatch.c',
        manpages='man/regpatch.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG registry popt POPT_SAMBA POPT_CREDENTIALS registry_common'
        )
 
@@ -45,7 +43,6 @@ bld.SAMBA_BINARY('regpatch',
 bld.SAMBA_BINARY('regshell',
        source='tools/regshell.c',
        manpages='man/regshell.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG popt registry POPT_SAMBA POPT_CREDENTIALS SMBREADLINE registry_common'
        )
 
@@ -53,7 +50,6 @@ bld.SAMBA_BINARY('regshell',
 bld.SAMBA_BINARY('regtree',
        source='tools/regtree.c',
        manpages='man/regtree.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG popt registry POPT_SAMBA POPT_CREDENTIALS registry_common'
        )
 

diff --git a/source4/lib/wmi/wscript_build b/source4/lib/wmi/wscript_build
index 6efc0bf8daa749e47bd58a28e39247e2a85f70fc..5984c23f82862886f99ac002792df995453041e4 100644 (file)
--- a/source4/lib/wmi/wscript_build
+++ b/source4/lib/wmi/wscript_build
@@ -9,14 +9,12 @@ bld.SAMBA_SUBSYSTEM('WMI',
 
 bld.SAMBA_BINARY('wmic',
        source='tools/wmic.c',
-       installdir='BINDIR',
        deps='POPT_SAMBA POPT_CREDENTIALS popt WMI'
        )
 
 
 bld.SAMBA_BINARY('wmis',
        source='tools/wmis.c',
-       installdir='BINDIR',
        deps='POPT_SAMBA POPT_CREDENTIALS popt WMI'
        )
 

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index fb062e6c84b843df7e670fa843fd2dcf1cfae1b3..f9a5eab185580df125456c752043560b11f8d11e 100644 (file)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -17,7 +17,6 @@ bld.SAMBA_LIBRARY('LIBNDR',
 bld.SAMBA_BINARY('ndrdump',
        source='../../librpc/tools/ndrdump.c',
        manpages='../../librpc/tools/ndrdump.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA NDR_TABLE LIBSAMBA-ERRORS'
        )
 

diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 815b586d79e7c8c202a55c21e51191450e299469..22a1d6b478673421f5a9cf1bfeaf43e9f7214850 100644 (file)
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -17,7 +17,6 @@ bld.SAMBA_SUBSYSTEM('PIDFILE',
 bld.SAMBA_BINARY('samba',
        source='server.c',
        manpages='samba.8',
-       installdir='SBINDIR',
         subsystem_name='service',
        deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE
                 popt gensec registry ntptr ntvfs share CLUSTER DCESRV''',

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 79deefb3ed2308cfc68e4d59ec31551bac56cd8f..3fa66b6d700ae7f7a58e9b0f19e5890a4cd39c48 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -135,7 +135,6 @@ bld.SAMBA_BINARY('smbtorture',
        source='smbtorture.c torture.c',
        manpages='man/smbtorture.1',
        public_headers='smbtorture.h',
-       installdir='BINDIR',
        deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
         needs_python=True
        )
@@ -144,7 +143,6 @@ bld.SAMBA_BINARY('smbtorture',
 bld.SAMBA_BINARY('gentest',
        source='gentest.c',
        manpages='man/gentest.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB LIBCLI_RAW'
        )
 
@@ -152,7 +150,6 @@ bld.SAMBA_BINARY('gentest',
 bld.SAMBA_BINARY('masktest',
        source='masktest.c',
        manpages='man/masktest.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB'
        )
 
@@ -165,6 +162,5 @@ bld.SAMBA_BINARY('locktest',
        # GCOV='1',
        manpages='man/locktest.1',
        deps='popt POPT_SAMBA POPT_CREDENTIALS LIBSAMBA-UTIL LIBCLI_SMB LIBSAMBA-HOSTCONFIG',
-       installdir='BINDIR'
        )
 

diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
index af1a0c931cba1799a44e994cf18d174babd483d3..fc0db09cb695139dcbab8836f4d03a6574a72dd4 100644 (file)
--- a/source4/utils/net/wscript_build
+++ b/source4/utils/net/wscript_build
@@ -12,7 +12,6 @@ bld.SAMBA_MODULE('net_drs',
 bld.SAMBA_BINARY('net',
        source='net.c net_password.c net_join.c net_vampire.c',
        autoproto='net_proto.h',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET popt POPT_SAMBA POPT_CREDENTIALS net_drs',
         needs_python=True
        )

diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index 00965a7b0f661848692ef4f75008b6c4a0db1a0f..5056cc02ccf801ca15a1109212366bfee6a6c9c2 100644 (file)
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -3,7 +3,6 @@
 bld.SAMBA_BINARY('ntlm_auth',
        source='ntlm_auth.c',
        manpages='man/ntlm_auth.1',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS service',
         needs_python=True
        )
@@ -11,14 +10,12 @@ bld.SAMBA_BINARY('ntlm_auth',
 
 bld.SAMBA_BINARY('setnttoken',
        source='setnttoken.c',
-       installdir='BINDIR',
        deps='talloc'
        )
 
 
 bld.SAMBA_BINARY('testparm',
        source='testparm.c',
-       installdir='BINDIR',
        deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt samba_socket POPT_SAMBA LIBCLI_RESOLVE CHARSET'
        )
 
@@ -26,7 +23,6 @@ bld.SAMBA_BINARY('testparm',
 bld.SAMBA_BINARY('oLschema2ldif',
        source='oLschema2ldif.c',
        manpages='man/oLschema2ldif.1',
-       installdir='BINDIR',
        deps='LIBLDB_CMDLINE SAMDB'
        )