From 21233bba9663f684cfa1ad129baa988cb52dea4d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 5 Nov 2010 02:08:44 +0100 Subject: wafsamba: Use project name variable rather than hardcoding 'samba4'. Suggested-By: Andrew Tridgell --- buildtools/wafsamba/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 78ccaa77f2..6913f63c91 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -67,7 +67,7 @@ def set_options(opt): action="store", dest='MODULESDIR', default='${PREFIX}/modules') opt.add_option('--with-privatelibdir', - help=("private library directory [PREFIX/lib/samba4]"), + help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME), action="store", dest='PRIVATELIBDIR', default=None) gr = opt.option_group('developer options') @@ -268,7 +268,7 @@ def configure(conf): conf.env.RPATH_ON_INSTALL = (conf.env.RPATH_ON_BUILD and not Options.options.disable_rpath_install) if not conf.env.PRIVATELIBDIR: - conf.env.PRIVATELIBDIR = '${PREFIX}/lib/samba4' + conf.env.PRIVATELIBDIR = '${PREFIX}/lib/%s' % Utils.g_module.APPNAME conf.env.RPATH_ON_INSTALL_PRIVATE = ( not Options.options.disable_rpath_private_install) else: -- cgit