summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Nagy <tnagy@waf.io>2015-09-28 21:47:16 +0200
committerMichael Adam <obnox@samba.org>2015-09-29 11:59:20 +0200
commit71a168eb2bc9df448bab73ae55e2cd8b514b03cd (patch)
treed7e839aa5170b1ab0e543734163ce23592cee81a
parent875beefcedd2ef9d608c7f58cec18a86a3fd51e1 (diff)
downloadsamba-71a168eb2bc9df448bab73ae55e2cd8b514b03cd.tar.gz
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>
-rwxr-xr-xctdb/wscript2
-rw-r--r--source3/wscript2
-rw-r--r--wscript2
3 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/wscript b/ctdb/wscript
index e04891ba817..eea25e93be8 100755
--- 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 26876206ccf..9ff9c2040d0 100644
--- 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 9431e11e836..c11e0c097fe 100644
--- 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