remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR']

This commit is contained in:
Paul Davis 2014-04-28 21:18:02 -04:00
parent 058986f77b
commit 1b989a93c2
10 changed files with 11 additions and 11 deletions

View File

@ -57,7 +57,7 @@ def build(bld):
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
]
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.install_path = bld.env['LIBDIR']
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
obj.uselib += ' FFTW3F'
obj.uselib += ' AUDIOUNITS OSX LO '

View File

@ -355,7 +355,7 @@ def build(bld):
obj.use.extend(['librubberband', 'libltc_includes', 'libltc'])
obj.vnum = LIBARDOUR_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.install_path = bld.env['LIBDIR']
obj.defines += [
'PACKAGE="' + I18N_PACKAGE + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
@ -569,7 +569,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
testobj.name = name
testobj.target = target
# not sure about install path
testobj.install_path = os.path.join(bld.env['LIBDIR'])
testobj.install_path = bld.env['LIBDIR']
testobj.defines = [
'PACKAGE="libardour3test"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',

View File

@ -82,7 +82,7 @@ def build(bld):
audiographer.uselib = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
audiographer.use = 'libpbd'
audiographer.vnum = AUDIOGRAPHER_LIB_VERSION
audiographer.install_path = os.path.join(bld.env['LIBDIR'])
audiographer.install_path = bld.env['LIBDIR']
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):

View File

@ -85,7 +85,7 @@ def build(bld):
obj.name = 'libcanvas'
obj.target = 'canvas'
obj.vnum = CANVAS_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:

View File

@ -73,7 +73,7 @@ def build(bld):
libsmf.uselib = 'GLIB'
libsmf.cxxflags = [ '-fPIC' ]
libsmf.cflags = [ '-fPIC' ]
libsmf.install_path = os.path.join(bld.env['LIBDIR'])
libsmf.install_path = bld.env['LIBDIR']
lib_source = '''
src/Control.cpp

View File

@ -101,7 +101,7 @@ def build(bld):
obj.uselib = 'GTKMM GTK GTKOSX OSX GDK'
obj.use = [ 'libpbd' ]
obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.install_path = bld.env['LIBDIR']
obj.defines += [
'PACKAGE="' + I18N_PACKAGE + '"',
'LOCALEDIR="' + os.path.join(

View File

@ -75,7 +75,7 @@ def build(bld):
obj.uselib = 'GLIBMM SIGCPP XML OSX'
obj.use = 'libpbd libevoral libtimecode'
obj.vnum = LIBMIDIPP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.install_path = bld.env['LIBDIR']
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests

View File

@ -53,7 +53,7 @@ def build(bld):
obj.name = 'libqmdsp'
obj.target = 'qmdsp'
obj.vnum = QM_DSP_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.install_path = bld.env['LIBDIR']
def shutdown():
autowaf.shutdown()

View File

@ -41,7 +41,7 @@ def build(bld):
obj.target = 'ardourcp'
obj.use = 'libardour'
obj.vnum = LIBARDOUR_CP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.install_path = bld.env['LIBDIR']
def shutdown():
autowaf.shutdown()

View File

@ -20,4 +20,4 @@ def build(bld):
obj.source = [ 'main.cpp', 'systemtest.cpp' ]
obj.target = 'sanityCheck'
obj.name = 'sanityCheck'
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.install_path = bld.env['LIBDIR']