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

34 files changed, 40 insertions, 39 deletions

diff --git a/export/wscript b/export/wscript
index 2dce68a01b..23a070f61d 100644
--- 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 5001bea77c..add8d230bb 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'], '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 0046e2eaec..c92110dd55 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'], '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 0e4cd5d7f4..d7f4eda0d1 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'], '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 c6ac7e74b3..8c8db6a9f4 100644
--- 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 b31d9b5d56..1f54e7a5e7 100644
--- 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 372470c859..814f16bc44 100644
--- 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 05add846c3..18a690f6f3 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'], '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 e0e5d5fb8a..6ef94e3aff 100644
--- 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 55c03fcdf5..cdfa057355 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'], '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 809f13840b..91273f3d79 100644
--- 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 6d9f1edbe8..9d417deec2 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'], '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 928b381326..59910b11fe 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'], '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 de6b21af25..6b7a04a7d9 100644
--- 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 63f029f287..f71f514b73 100644
--- 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 b66a2ffee6..25ab9e5835 100644
--- 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 8fe9dc8e8a..c2bb313e27 100644
--- 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 e009cc4ed2..3e7b423fc7 100644
--- 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 96d0b629dd..8bede48323 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'], '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 f14cee042f..1497ab7b3d 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'], '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 4fcbe6fde3..614c6f2841 100644
--- 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 40cb76c9e4..b083423eec 100644
--- 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 c1e63e2894..fd3e9552be 100644
--- 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 a63b580e12..fa4918a8f1 100644
--- 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 83c39f1d11..6cbafb5173 100644
--- 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 8513a5be51..b3ea4404a8 100644
--- 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 4808d33612..06d440fa57 100644
--- 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 48526d0783..10f11149d8 100644
--- 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 b1ff9c156b..e3cc341419 100644
--- 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 727f3b6b29..ec2e65316a 100644
--- 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 3b852974c3..ea54532e13 100644
--- 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 8dff100d1a..3ea6c4a1e5 100644
--- 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 6bb2274f3f..7fa7045cee 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'], 'ardour3')
+    obj.install_path = os.path.join(bld.env['LIBDIR'])
diff --git a/wscript b/wscript
index 3f0a01dcf5..52d1ec6e28 100644
--- 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)