summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-28 19:30:13 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:14 +1000
commit06e10a290474473e00c0e39a8dbb85d36005c2ff (patch)
treefb63edf3567ebf619532c6f4abec113dcdd8bf3c
parent20146b3fe03f08c72db313973b75019e13198534 (diff)
downloadsamba-06e10a290474473e00c0e39a8dbb85d36005c2ff.tar.gz
samba-06e10a290474473e00c0e39a8dbb85d36005c2ff.tar.bz2
samba-06e10a290474473e00c0e39a8dbb85d36005c2ff.zip
build: work around missing defaults from gnu_dirs.py
-rw-r--r--buildtools/wafsamba/wscript15
1 files changed, 3 insertions, 12 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index b2a11064fe..bf2488a880 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -30,15 +30,6 @@ def set_options(opt):
help=("command separated list of libraries to build directly into binaries [%s]" % builtin_defauilt),
action="store", dest='BUILTIN_LIBRARIES', default=builtin_defauilt)
- opt.add_option('--libdir',
- help=("object code libraries [PREFIX/lib]"),
- action="store", dest='LIBDIR', default='${PREFIX}/lib')
- opt.add_option('--bindir',
- help=("user executables [PREFIX/bin]"),
- action="store", dest='BINDIR', default='${PREFIX}/bin')
- opt.add_option('--sbindir',
- help=("system admin executables [PREFIX/sbin]"),
- action="store", dest='SBINDIR', default='${PREFIX}/sbin')
opt.add_option('--with-modulesdir',
help=("modules directory [PREFIX/modules]"),
action="store", dest='MODULESDIR', default='${PREFIX}/modules')
@@ -90,9 +81,9 @@ def configure(conf):
conf.check_tool('gccdeps', tooldir=conf.srcdir + "/buildtools/wafsamba")
# make the install paths available in environment
- conf.env.LIBDIR = Options.options.LIBDIR
- conf.env.BINDIR = Options.options.BINDIR
- conf.env.SBINDIR = Options.options.SBINDIR
+ conf.env.LIBDIR = Options.options.LIBDIR or '${PREFIX}/lib'
+ conf.env.BINDIR = Options.options.BINDIR or '${PREFIX}/bin'
+ conf.env.SBINDIR = Options.options.SBINDIR or '${PREFIX}/sbin'
conf.env.MODULESDIR = Options.options.MODULESDIR
conf.env.BUNDLED_LIBS = Options.options.BUNDLED_LIBS.split(',')
conf.env.BUILTIN_LIBRARIES = Options.options.BUILTIN_LIBRARIES.split(',')