From a43ebeb19c44a69eb948974e6f85ef8c849ec73e Mon Sep 17 00:00:00 2001
From: nedko <nedko@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Wed, 17 Dec 2008 12:36:11 +0000
Subject: [PATCH] Fix #110 (--libdir option for ./waf configure)

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3211 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/wscript |  6 ++++--
 wscript        | 11 +++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/common/wscript b/common/wscript
index 1c0a1c4f..189632bb 100644
--- a/common/wscript
+++ b/common/wscript
@@ -94,6 +94,7 @@ def build(bld):
     serverlib.name         = 'serverlib'
     serverlib.target       = 'jackserver'
     serverlib.uselib = uselib
+    serverlib.install_path = '${LIBDIR}'
     serverlib.source = [] + common_libsources
     serverlib.source += [
         'JackAudioDriver.cpp',
@@ -145,6 +146,7 @@ def build(bld):
     clientlib.features.append('cc')
     clientlib.defines = 'HAVE_CONFIG_H'
     clientlib.uselib = uselib
+    clientlib.install_path = '${LIBDIR}'
     if bld.env['BUILD_JACKDBUS'] == True:
         clientlib.uselib.append('DBUS-1')
     clientlib.includes = includes
@@ -222,10 +224,10 @@ def build(bld):
     obj.source = '../jack.pc.in'
     obj.target = 'jack.pc'
     obj.dict = {'PREFIX': bld.env['PREFIX'],
-                'LIBDIR': os.path.normpath(bld.env['PREFIX'] + '/lib'),
+                'LIBDIR': bld.env['LIBDIR'],
                 'INCLUDEDIR': os.path.normpath(bld.env['PREFIX'] + '/include'),
                 'SERVERLIB': serverlib.target,
                 'JACK_VERSION': bld.env['JACK_VERSION'],
                 }
-    obj.install_path = '${PREFIX}/lib/pkgconfig/'
+    obj.install_path = '${LIBDIR}/pkgconfig/'
     obj.fun = misc.subst_func
diff --git a/wscript b/wscript
index 203eab8c..f3d5a924 100644
--- a/wscript
+++ b/wscript
@@ -60,6 +60,7 @@ def set_options(opt):
     opt.tool_options('compiler_cxx')
     opt.tool_options('compiler_cc')
 
+    opt.add_option('--libdir', type='string', help="Library directory [Default: <prefix>/lib]")
     opt.add_option('--dbus', action='store_true', default=False, help='Enable D-Bus JACK (jackdbus)')
     opt.add_option('--doxygen', action='store_true', default=False, help='Enable build of doxygen documentation')
     opt.add_option('--monitor', action='store_true', default=False, help='Build with monitoring records')
@@ -100,11 +101,16 @@ def configure(conf):
     conf.env['BUILD_DOXYGEN_DOCS'] = Options.options.doxygen
     conf.env['BUILD_WITH_MONITOR'] = Options.options.monitor
 
+    if Options.options.libdir:
+        conf.env['LIBDIR'] = Options.options.libdir
+    else:
+        conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib/'
+
     conf.define('CLIENT_NUM', Options.options.clients)
     conf.define('PORT_NUM', Options.options. ports)
 
-    conf.define('ADDON_DIR', os.path.normpath(conf.env['PREFIX'] + '/lib/jack'))
-    conf.define('JACK_LOCATION', os.path.normpath(conf.env['PREFIX'] + '/bin'))
+    conf.define('ADDON_DIR', os.path.normpath(os.path.join(conf.env['LIBDIR'], 'jack')))
+    conf.define('JACK_LOCATION', os.path.normpath(os.path.join(conf.env['PREFIX'], 'bin')))
     conf.define('USE_POSIX_SHM', 1)
     conf.define('JACKMP', 1)
     if conf.env['BUILD_JACKDBUS'] == True:
@@ -133,6 +139,7 @@ def configure(conf):
     print "Build with a maximum of %d ports" % conf.env['PORT_NUM']
  
     display_msg("Install prefix", conf.env['PREFIX'], 'CYAN')
+    display_msg("Library directory", conf.env['LIBDIR'], 'CYAN')
     display_msg("Drivers directory", conf.env['ADDON_DIR'], 'CYAN')
     display_feature('Build doxygen documentation', conf.env['BUILD_DOXYGEN_DOCS'])
     display_feature('Build with monitoring records', conf.env['BUILD_WITH_MONITOR'])