From b642b50320b6f6b42bcf0c9260058d3a905621dd Mon Sep 17 00:00:00 2001 From: Brendan Jones Date: Sat, 5 Jan 2013 09:11:46 +0100 Subject: [PATCH 2/2] Add shared library dir patch --- trunk/wscript | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/trunk/wscript b/trunk/wscript index a0d4a57..9c0d8fb 100644 --- a/trunk/wscript +++ b/trunk/wscript @@ -79,6 +79,12 @@ def set_options(opt): dest='cxxflags', help='C++ base compiler flags [Default: %default]') + comp.add_option('--libdir', + type='string', + default='', + dest='libdir', + help='Shared library directory') + comp.add_option('--ldflags', type='string', default='', @@ -562,8 +568,12 @@ def configure(conf): conf.define('OS_32_BIT', 1) # writing config.h conf.write_config_header('config.h') + + if not opt.libdir: + conf.define('LIBDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'lib'))) + else: + conf.define('LIBDIR', opt.libdir) - conf.define('LIBDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'lib'))) conf.define('BINDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'bin'))) conf.define('DESKAPPS_DIR', os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))) conf.define('BIN_NAME', APPNAME) -- 1.8.0.2