summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--headless/wscript2
-rw-r--r--libs/ardour/wscript4
-rw-r--r--libs/audiographer/wscript2
-rw-r--r--libs/canvas/wscript2
-rw-r--r--libs/evoral/wscript2
-rw-r--r--libs/gtkmm2ext/wscript2
-rw-r--r--libs/midi++2/wscript2
-rw-r--r--libs/qm-dsp/wscript2
-rw-r--r--libs/surfaces/control_protocol/wscript2
-rw-r--r--tools/sanity_check/wscript2
10 files changed, 11 insertions, 11 deletions
diff --git a/headless/wscript b/headless/wscript
index add8d230bb..be80f9c73b 100644
--- 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 c92110dd55..4a50064545 100644
--- 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 d7f4eda0d1..2fe2739741 100644
--- 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 18a690f6f3..0c5192645c 100644
--- 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 cdfa057355..a4aea3a3a2 100644
--- 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 9d417deec2..c2de82d0c2 100644
--- 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 59910b11fe..e8bfdab217 100644
--- 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 8bede48323..ef15abffb7 100644
--- 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 1497ab7b3d..1c4235bd14 100644
--- 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 7fa7045cee..000753e18b 100644
--- 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']