finish unfinished work at basing all install paths on the program name

diff --git a/export/wscript b/export/wscript
index 2dce68a01bdcb197b8cff48e3b760962f488d71a..23a070f61dc47c0b3baddcfcc5d5c95597804f7f 100644 (file)
--- a/export/wscript
+++ b/export/wscript
@@ -11,7 +11,7 @@ def configure(conf):
 def build(bld):
     presets = bld.path.ant_glob ('*.preset')
     formats = bld.path.ant_glob ('*.format')
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'export'),
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'export'),
                       presets + formats)
 
 def options(opt):

diff --git a/headless/wscript b/headless/wscript
index 5001bea77c5d47594135388e85a09960146ca08f..add8d230bb021849e0d2715c6a3de9efb31e481d 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'], 'ardour3')
+    obj.install_path = os.path.join(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 0046e2eaecf16c70c249aeec79e2194ef389ee94..c92110dd553508b21d6084d1966577ee29115b6d 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'], 'ardour3')
+    obj.install_path = os.path.join(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'], 'ardour3')
+    testobj.install_path = os.path.join(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 0e4cd5d7f4f62dfa472611f2dfe5fbe7cba0faab..d7f4eda0d19669fcd64aca47b9e42fc912aef967 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'], 'ardour3')
+    audiographer.install_path   = os.path.join(bld.env['LIBDIR'])
 
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):

diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript
index c6ac7e74b398a0b912c1b73947145dff7147b7bf..8c8db6a9f4916b087466d946882520efc5660713 100644 (file)
--- a/libs/backends/dummy/wscript
+++ b/libs/backends/dummy/wscript
@@ -31,7 +31,7 @@ def build(bld):
     obj.target   = 'dummy_audiobackend'
     obj.use      = 'libardour libpbd'
     obj.vnum     = DUMMYBACKEND_VERSION
-    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
+    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
                    'ARDOURBACKEND_DLL_EXPORTS'
                   ]

diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
index b31d9b5d56452cd3b6f2e26f5df82cdc1fa74208..1f54e7a5e704db701ddebba1913363197ac13f39 100644 (file)
--- a/libs/backends/jack/wscript
+++ b/libs/backends/jack/wscript
@@ -51,7 +51,7 @@ def build(bld):
         obj.uselib   = [ 'JACK' ]
     obj.use      = 'libardour libpbd'
     obj.vnum     = JACKBACKEND_VERSION
-    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
+    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 
                    'ARDOURBACKEND_DLL_EXPORTS'
                    ]

diff --git a/libs/backends/wavesaudio/wscript b/libs/backends/wavesaudio/wscript
index 372470c859300238c3244f8d8214cde0eabe328a..814f16bc44956ab7fd2d422cc75ac1dd63e99651 100644 (file)
--- a/libs/backends/wavesaudio/wscript
+++ b/libs/backends/wavesaudio/wscript
@@ -67,7 +67,7 @@ def build(bld):
     obj.target   = 'waves_audiobackend'
     obj.use      = [ 'libardour', 'libpbd' ]
     obj.vnum     = WAVESAUDIOBACKEND_VERSION
-    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
+    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'backends')
     obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
             '__MACOS__',
             'ARDOURBACKEND_DLL_EXPORTS'

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 05add846c3fedfde92a819633453273f7f787f2f..18a690f6f3f069f56394fe521c725d2527829599 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'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])
     obj.defines      += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
     
     if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:

diff --git a/libs/clearlooks-newer/wscript b/libs/clearlooks-newer/wscript
index e0e5d5fb8a4f5b24a2e6f3e4dcda225480e6294a..6ef94e3afff6d5e2b2931684d5d21b38fda0b38d 100644 (file)
--- a/libs/clearlooks-newer/wscript
+++ b/libs/clearlooks-newer/wscript
@@ -35,7 +35,7 @@ def build(bld):
     obj.target = 'clearlooks'
     obj.uselib = 'GTK'
     obj.includes = '.'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'engines')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'engines')
     autowaf.ensure_visible_symbols (obj, True)
 
     if sys.platform == 'darwin':

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 55c03fcdf522d801fd3c293c77b7be4709c063c0..cdfa0573555987bd0e7c6ddb37afdbfaa215cb32 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'], 'ardour3')
+    libsmf.install_path = os.path.join(bld.env['LIBDIR'])
 
     lib_source = '''
             src/Control.cpp
@@ -108,7 +108,7 @@ def build(bld):
     obj.uselib         = 'GLIBMM GTHREAD SMF'
     obj.use            = 'libsmf libpbd'
     obj.vnum           = EVORAL_LIB_VERSION
-    obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path   = bld.env['LIBDIR']
     obj.defines       += [ 'PACKAGE="libevoral"', 'EVORAL_MIDI_XML=1' ]
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):

diff --git a/libs/fst/wscript b/libs/fst/wscript
index 809f13840b25438288819c490da61137a873615d..91273f3d793b7e02d8ad8947cde201aaa626f8e4 100644 (file)
--- a/libs/fst/wscript
+++ b/libs/fst/wscript
@@ -51,7 +51,7 @@ def build(bld):
         obj.source = 'scanner.wine'
         obj.target = 'ardour-vst-scanner'
         obj.chmod  = Utils.O755
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3/fst')
+        obj.install_path = os.path.join(bld.env['LIBDIR'], 'fst')
         obj.dict   = {
             'VERSION' : bld.env['VERSION'],
                 }
@@ -83,4 +83,4 @@ def build(bld):
         'VST_SCANNER_APP',
         'PACKAGE="' + I18N_PACKAGE + '"',
         ]
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3/fst')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'fst')

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 6d9f1edbe8078ff74275090555c838b62d4ed0fc..9d417deec2a5ea8ee6cfd299f1b617df71267df7 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'], 'ardour3')
+    obj.install_path = os.path.join(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 928b381326815b0aef7bd6fe583b81999b8ebbd7..59910b11fe119ab5921d4729a2c19d20a3f24b7e 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'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): 
         # Unit tests

diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript
index de6b21af25cfaf40a830b181f2cc37d97732b967..6b7a04a7d9413bb735efc1abb978ef2c0b667d2e 100644 (file)
--- a/libs/panners/1in2out/wscript
+++ b/libs/panners/1in2out/wscript
@@ -29,7 +29,7 @@ def build(bld):
     obj.target       = 'pan1in2out'
     obj.use          = 'libardour libardour_cp libpbd'
     obj.vnum         = LIBARDOUR_PAN1IN2OUT_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript
index 63f029f28793ddbae80b672c6716eb8f82589cdd..f71f514b730f7bbe6111b124d345a550167d6ef0 100644 (file)
--- a/libs/panners/2in2out/wscript
+++ b/libs/panners/2in2out/wscript
@@ -29,7 +29,7 @@ def build(bld):
     obj.target       = 'pan2in2out'
     obj.use          = 'libardour libardour_cp libpbd'
     obj.vnum         = LIBARDOUR_PAN2IN2OUT_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/panners/stereobalance/wscript b/libs/panners/stereobalance/wscript
index b66a2ffee60e87faf103df9d8e37b64a51385f34..25ab9e5835f3407bbd8003cda2b7fbb92ad5b71e 100644 (file)
--- a/libs/panners/stereobalance/wscript
+++ b/libs/panners/stereobalance/wscript
@@ -29,7 +29,7 @@ def build(bld):
     obj.target       = 'panbalance'
     obj.use          = 'libardour libardour_cp libpbd'
     obj.vnum         = LIBARDOUR_PAN2IN2OUT_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript
index 8fe9dc8e8aa6f547dfc014ac4cbd39356f3f70a0..c2bb313e27df2072b3dfdc086f3d0d1c028162e9 100644 (file)
--- a/libs/panners/vbap/wscript
+++ b/libs/panners/vbap/wscript
@@ -29,7 +29,7 @@ def build(bld):
     obj.target       = 'panvbap'
     obj.use          = 'libardour libardour_cp libpbd'
     obj.vnum         = LIBARDOUR_PANVBAP_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index e009cc4ed21df722c4088dfdb47d14b609fdde03..3e7b423fc74133728de701451b0ccf387f92a87c 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -146,7 +146,7 @@ def build(bld):
             obj.source += [ 'cocoa_open_uri.mm' ]
         obj.uselib += ' OSX'
     obj.vnum         = LIBPBD_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj.install_path = bld.env['LIBDIR']
     obj.defines     += [ 'PACKAGE="' + I18N_PACKAGE + '"',
                          ]
 

diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index 96d0b629dd184fe7bc84d5ae761ef06cb642988b..8bede48323b34e7c0f425061c00db40f8b64194b 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'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index f14cee042f27106156aa873d8e7121a12d7ddd6d..1497ab7b3dfaf37e222ad90b18ebf9aae9f3968f 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'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 4fcbe6fde369b49f2bc4f0ae8f3dfd9629739949..614c6f28417b63fba44123ee60e13db6371ea2ff 100644 (file)
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -41,7 +41,7 @@ def build(bld):
     obj.target       = 'generic_midi'
     obj.use          = 'libardour libardourcp'
     obj.vnum         = LIBSURFACES_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index 40cb76c9e44ac319e8fc85ea38e42a80ddcec021..b083423eec4a2079d4bd6b3941a4226577cbadcb 100644 (file)
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -38,7 +38,7 @@ def build(bld):
     obj.uselib       = 'GTKMM GTK GDK'
     obj.use          = 'libardour libardour_cp libgtkmm2ext libpbd'
     obj.vnum         = LIBARDOUR_GENERIC_MIDI_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index c1e63e2894a0615e6cbf9a7105a8ee4e84cb806e..fd3e9552bee7eebe042be4704fa79f95b2fc268a 100644 (file)
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -50,7 +50,7 @@ def build(bld):
     obj.uselib       = 'GTKMM'
     obj.use          = 'libardour libardour_cp libgtkmm2ext'
     obj.vnum         = LIBARDOUR_MCP_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index a63b580e12f6b87e9315ccf533d568aed91dad1d..fa4918a8f104caad3a68d736c0b0af406331c510 100644 (file)
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -35,7 +35,7 @@ def build(bld):
     obj.uselib       = ' LO '
     obj.use          = 'libardour libardour_cp libpbd'
     obj.vnum         = LIBARDOUR_OSC_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index 83c39f1d115375e7925675ed80748de3ea9da9ae..6cbafb5173c4a4fd08646efb7d17abc840814395 100644 (file)
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -46,7 +46,7 @@ def build(bld):
     obj.target       = 'ardour_tranzport'
     obj.use          = 'libardour libardour_cp'
     obj.vnum         = LIBARDOUR_TRANZPORT_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index 8513a5be513305e6f989fa57d94d13b150595d0c..b3ea4404a8f934b539e1c1f850b45abda99daea5 100644 (file)
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -33,7 +33,7 @@ def build(bld):
     obj.uselib       = 'GTKMM CWIID'
     obj.use          = 'libardour libardour_cp libgtkmm2ext'
     obj.vnum         = LIBARDOUR_WIIMOTE_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript
index 4808d33612d98ec48bf6e0788b41355fe8d5e1fd..06d440fa572892562e07b4ad1d0fe608f0d85bf2 100644 (file)
--- a/libs/vamp-plugins/wscript
+++ b/libs/vamp-plugins/wscript
@@ -55,7 +55,7 @@ def build(bld):
         obj.source += ' Onset.cpp '
         obj.uselib += ' AUBIO '
     obj.vnum         = LIBARDOURVAMPPLUGINS_LIB_VERSION
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'vamp')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'vamp')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/libs/vfork/wscript b/libs/vfork/wscript
index 48526d07836cdacba300c36a13f30f6f69a460c3..10f11149d856dacc5c2b1be40d70ddbfa725a1a3 100644 (file)
--- a/libs/vfork/wscript
+++ b/libs/vfork/wscript
@@ -21,7 +21,7 @@ def build(bld):
     obj = bld (features = 'c cprogram')
     obj.source = 'exec_wrapper.c'
     obj.target = 'ardour-exec-wrapper'
-    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3/vfork')
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'vfork')
     obj.defines = [
             '_POSIX_SOURCE',
             '_XOPEN_SOURCE=500',

diff --git a/mcp/wscript b/mcp/wscript
index b1ff9c156b0135e59886a78fb5f069ff2ed4e86d..e3cc341419146e13daa5bf128bae17e839db7660 100644 (file)
--- a/mcp/wscript
+++ b/mcp/wscript
@@ -11,8 +11,8 @@ def configure(conf):
 def build(bld):
     devinfo = bld.path.ant_glob ('*.device')
     profiles = bld.path.ant_glob ('*.profile')
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'mcp'), devinfo)
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'mcp'), profiles)
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'mcp'), devinfo)
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'mcp'), profiles)
 
 def options(opt):
     pass

diff --git a/midi_maps/wscript b/midi_maps/wscript
index 727f3b6b298f24221a5a46048abe49cdfee54086..ec2e65316a25c0caaf8cb7e98d6dc1f3df1f16a6 100644 (file)
--- a/midi_maps/wscript
+++ b/midi_maps/wscript
@@ -10,7 +10,7 @@ def configure(conf):
 
 def build(bld):
     maps = bld.path.ant_glob ('*.map')
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'midi_maps'),
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'midi_maps'),
                        maps)
 
 def options(opt):

diff --git a/patchfiles/wscript b/patchfiles/wscript
index 3b852974c3918aa0f3a9e2d297671437a5f6b9b0..ea54532e1326d62c74db9218f04560f0c6026dd2 100644 (file)
--- a/patchfiles/wscript
+++ b/patchfiles/wscript
@@ -10,7 +10,7 @@ def configure(conf):
 
 def build(bld):
     patchfiles = bld.path.ant_glob ('*.midnam')
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'patchfiles'), patchfiles)
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'patchfiles'), patchfiles)
 
 def options(opt):
     pass

diff --git a/templates/wscript b/templates/wscript
index 8dff100d1a0998b28ecba28fdc2a69f2dec4a1b1..3ea6c4a1e5c0cbb456f5e7b334446ee98e33578a 100644 (file)
--- a/templates/wscript
+++ b/templates/wscript
@@ -35,7 +35,7 @@ def build(bld):
                   name = 'template',
                   source = [ t ],
                   target = [ os.path.join(dir_name, file_name) ],
-                  install_path = os.path.join(bld.env['DATADIR'], 'ardour3', os.path.join('templates', dir_name)))
+                  install_path = os.path.join(bld.env['DATADIR'], os.path.join('templates', dir_name)))
 
 def options(opt):
     pass

diff --git a/tools/sanity_check/wscript b/tools/sanity_check/wscript
index 6bb2274f3f9707e44371d83453cc423401005415..7fa7045ceebdac838e0da97ea51835638291d174 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'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])

diff --git a/wscript b/wscript
index 3f0a01dcf570f849202f16d570e567d785f31f23..52d1ec6e28ad31fb9fc657aab65e170ff1e35712 100644 (file)
--- a/wscript
+++ b/wscript
@@ -874,8 +874,9 @@ def build(bld):
     bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname)
     # data files loaded at run time go here
     bld.env['DATADIR'] = os.path.join(bld.env['DATADIR'], lwrcase_dirname)
-    # shared objects loaded at runtime go here
+    # shared objects loaded at runtime go here (two aliases)
     bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname)
+    bld.env['LIBDIR'] = bld.env['DLLDIR']
 
     autowaf.set_recursive()
 
@@ -890,7 +891,7 @@ def build(bld):
     for i in children:
         bld.recurse(i)
 
-    bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc')
+    bld.install_files (bld.env['SYSCONFDIR'], 'ardour_system.rc')
 
     if bld.env['RUN_TESTS']:
         bld.add_post_fun(test)