LADI
/
jackdbus
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wscripts when --libdir is used. 

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3593 0c269be4-1314-0410-8aa9-9f06e86f4224
This commit is contained in:
sletz 2009-07-10 10:17:34 +00:00
parent 418e268f46
commit 5bd0d7711f
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/wscript
View File

@ -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)

6
dbus/wscript
View File

@ -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')

8
wscript
View File

@ -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 + "'" )