1
0
mirror of https://github.com/samba-team/samba.git synced 2025-09-19 13:44:20 +03:00

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>
This commit is contained in:
Thomas Nagy
2015-09-28 21:47:16 +02:00
committed by Michael Adam
parent 875beefced
commit 71a168eb2b
3 changed files with 3 additions and 3 deletions

View File

@@ -26,7 +26,7 @@ else:
version = samba_version.samba_version_file('%s/VERSION' % vdir, vdir, env) version = samba_version.samba_version_file('%s/VERSION' % vdir, vdir, env)
VERSION = version.STRING.replace('-', '.') 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 samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tevent:lib/tevent lib/tdb:lib/tdb lib/tevent:lib/tevent lib/tdb:lib/tdb

View File

@@ -11,7 +11,7 @@ import build.charset
import samba_utils, samba_version import samba_utils, samba_version
import samba3 import samba3
Options.default_prefix = '/usr/local/samba' default_prefix = Options.default_prefix = '/usr/local/samba'
def set_options(opt): def set_options(opt):

View File

@@ -15,7 +15,7 @@ samba_dist.DIST_DIRS('.')
samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions') samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions')
# install in /usr/local/samba by default # 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: # This callback optionally takes a list of paths as arguments:
# --with-system_mitkrb5 /path/to/krb5 /another/path # --with-system_mitkrb5 /path/to/krb5 /another/path