build:wafsamba: Set the default installation prefix for Waf 1.8

These changes enable the default installation prefix settings to
take effect in both Waf 1.5 and 1.8 with no additional code changes.

Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/ctdb/wscript b/ctdb/wscript
index e04891ba817db0b76d7635f6c172772ebd0f48e2..eea25e93be8a94d5740fd0afce16803c852934b3 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -26,7 +26,7 @@ else:
 version = samba_version.samba_version_file('%s/VERSION' % vdir, vdir, env)
 VERSION = version.STRING.replace('-', '.')
 
-Options.default_prefix = '/usr/local'
+default_prefix = Options.default_prefix = '/usr/local'
 
 samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc
                         lib/tevent:lib/tevent lib/tdb:lib/tdb

diff --git a/source3/wscript b/source3/wscript
index 26876206ccfa53aecf7408785f2f21afa29b1290..9ff9c2040d0a3851ace1828754e44684a80c0c43 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -11,7 +11,7 @@ import build.charset
 import samba_utils, samba_version
 import samba3
 
-Options.default_prefix = '/usr/local/samba'
+default_prefix = Options.default_prefix = '/usr/local/samba'
 
 def set_options(opt):
 

diff --git a/wscript b/wscript
index 9431e11e836208510162f3acd0ed520402efcd41..c11e0c097fe692fc863444fef8bf8d982a70dfd8 100644 (file)
--- a/wscript
+++ b/wscript
@@ -15,7 +15,7 @@ samba_dist.DIST_DIRS('.')
 samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions')
 
 # install in /usr/local/samba by default
-Options.default_prefix = '/usr/local/samba'
+default_prefix = Options.default_prefix = '/usr/local/samba'
 
 # This callback optionally takes a list of paths as arguments:
 # --with-system_mitkrb5 /path/to/krb5 /another/path