From 5bd0d7711f9f753bbbe5f6cb5bfc5af73225e293 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 10 Jul 2009 10:17:34 +0000
Subject: [PATCH] Fix wscripts when --libdir is used.

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

diff --git a/common/wscript b/common/wscript
index 2b1a1927..d63eab72 100644
--- a/common/wscript
+++ b/common/wscript
@@ -229,7 +229,7 @@ def build(bld):
     if bld.env['BUILD_WITH_32_64']:
         print "create 32bit lib..."
         clientlib32bit = clientlib.clone('lib32')
-
+  
     create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib)
 
     create_jack_process_obj(bld, 'profiler', 'JackProfiler.cpp', serverlib)
diff --git a/dbus/wscript b/dbus/wscript
index f33c51a2..e23e67b0 100644
--- a/dbus/wscript
+++ b/dbus/wscript
@@ -32,10 +32,12 @@ def configure(conf):
     if conf.is_defined('HAVE_EXPAT'):
         conf.env['LIB_EXPAT'] = ['expat']
 
-    conf.env['BUILD_JACKDBUS'] = conf.is_defined('HAVE_EXPAT') and conf.is_defined('HAVE_DBUS_1')
+    conf.env['BUILD_JACKDBUS1'] = conf.is_defined('HAVE_EXPAT') and conf.is_defined('HAVE_DBUS_1')
+
 
 def build(bld):
-    if bld.env["BUILD_JACKDBUS"] != True:
+
+    if bld.env['BUILD_JACKDBUS1'] != True:
         return
 
     obj = bld.new_task_gen('cc', 'program')
diff --git a/wscript b/wscript
index 8c01c384..917208d0 100644
--- a/wscript
+++ b/wscript
@@ -132,9 +132,9 @@ def configure(conf):
         conf.env['BUILD_JACKD'] = True
 
     if Options.options.libdir:
-        conf.env['LIBDIR'] = Options.options.libdir
+        conf.env['LIBDIR'] = conf.env['PREFIX'] + Options.options.libdir
     else:
-        conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib/'
+        conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib'
 
     conf.define('CLIENT_NUM', Options.options.clients)
     conf.define('PORT_NUM', Options.options.ports)
@@ -220,9 +220,9 @@ def configure(conf):
     	conf.env.append_unique('LINKFLAGS', '-m32')
         conf.write_config_header('config.h')
     	if Options.options.libdir32:
-	    conf.env['LIBDIR'] = Options.options.libdir32
+	    conf.env['LIBDIR'] = conf.env['PREFIX'] + Options.options.libdir32
     	else:
-	    conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib32/'
+	    conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib32'
 
 def build(bld):
     print ("make[1]: Entering directory `" + os.getcwd() + "/" + blddir + "'" )