diff options
| -rw-r--r-- | buildtools/wafsamba/samba_install.py | 7 | ||||
| -rw-r--r-- | buildtools/wafsamba/wscript | 5 |
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 |