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

diff --git a/headless/wscript b/headless/wscript
index add8d230bb021849e0d2715c6a3de9efb31e481d..be80f9c73b7ea80de710dab43c7dea2bd23663ca 100644 (file)
--- a/headless/wscript
+++ b/headless/wscript
@@ -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 '

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index c92110dd553508b21d6084d1966577ee29115b6d..4a500645452f046d68c7855799d602e579539dcc 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -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']) + '"',

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index d7f4eda0d19669fcd64aca47b9e42fc912aef967..2fe2739741444d979341fb81fee215727ecd4cf7 100644 (file)
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -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'):

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 18a690f6f3f069f56394fe521c725d2527829599..0c5192645c43d3683c213f6521af79c75bf17896 100644 (file)
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -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']:

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index cdfa0573555987bd0e7c6ddb37afdbfaa215cb32..a4aea3a3a269f137dd16c089b25460532eb8497d 100644 (file)
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -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

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 9d417deec2a5ea8ee6cfd299f1b617df71267df7..c2de82d0c27f3389f60fccb8a1ccac6561dbe9f6 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -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(

diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index 59910b11fe119ab5921d4729a2c19d20a3f24b7e..e8bfdab217967e31c6216ca5c528a92f8465aaaa 100644 (file)
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -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

diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index 8bede48323b34e7c0f425061c00db40f8b64194b..ef15abffb73805454b9bed95ac12d6b64c8351a7 100644 (file)
--- a/libs/qm-dsp/wscript
+++ b/libs/qm-dsp/wscript
@@ -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()

diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index 1497ab7b3dfaf37e222ad90b18ebf9aae9f3968f..1c4235bd148bc6119ef3fb5ada4770bc3a4d27f4 100644 (file)
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -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()

diff --git a/tools/sanity_check/wscript b/tools/sanity_check/wscript
index 7fa7045ceebdac838e0da97ea51835638291d174..000753e18bfdac5a32ee16dd39e1e51f291c9e7f 100644 (file)
--- a/tools/sanity_check/wscript
+++ b/tools/sanity_check/wscript
@@ -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']