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

7 files changed, 7 insertions, 7 deletions

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()