summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-04 23:23:39 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-05 02:06:05 +0000
commite15cd9c6d5262b516b43208fd41ac398606caa46 (patch)
tree4d879ccc6b5eaa665ff05ef51a6081461b4173a8 /buildtools
parent0d4fa8514b4825c9b3d2383a9e12197b69b2e80f (diff)
downloadsamba-e15cd9c6d5262b516b43208fd41ac398606caa46.tar.gz
samba-e15cd9c6d5262b516b43208fd41ac398606caa46.tar.bz2
samba-e15cd9c6d5262b516b43208fd41ac398606caa46.zip
Add --with-privatelibdir build option.
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_install.py7
-rw-r--r--buildtools/wafsamba/wscript5
2 files changed, 11 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 0d43236d97..8b9a308a2c 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -64,7 +64,12 @@ def install_library(self):
return
# setup the install path, expanding variables
- install_path = getattr(self, 'samba_inst_path', None) or '${LIBDIR}'
+ install_path = getattr(self, 'samba_inst_path', None)
+ if install_path is None:
+ if getattr(self, 'private_library', False):
+ install_path = '${PRIVATELIBDIR}'
+ else:
+ install_path = '${LIBDIR}'
install_path = bld.EXPAND_VARIABLES(install_path)
if install_ldflags != build_ldflags:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index b9b06abfe8..7d8bb24414 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -63,6 +63,10 @@ def set_options(opt):
help=("modules directory [PREFIX/modules]"),
action="store", dest='MODULESDIR', default='${PREFIX}/modules')
+ opt.add_option('--with-privatelibdir',
+ help=("private library directory [PREFIX/lib/samba4]"),
+ action="store", dest='PRIVATELIBDIR', default='${PREFIX}/lib/samba4')
+
gr = opt.option_group('developer options')
gr.add_option('-C',
@@ -201,6 +205,7 @@ def configure(conf):
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.PRIVATELIBDIR = Options.options.PRIVATELIBDIR
conf.env.BUNDLED_LIBS = Options.options.BUNDLED_LIBS.split(',')
conf.env.BUILTIN_LIBRARIES = Options.options.BUILTIN_LIBRARIES.split(',')
conf.env.DISABLE_SHARED = Options.options.disable_shared