Fix install path problems (s/ardour2/ardour3).

Fix finding of keybindings file when running from source tree (via ardev/ardbg).
Fix clashing keybindings for zoom stuff.
Add note tool keybinding and menu entry.

git-svn-id: svn://localhost/ardour2/branches/3.0@3099 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index d6d7f987dd78e099cbc113a5b473eaeed5b66871..705d0cd789366de34b31700be11ae3a6b389eb81 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -461,12 +461,12 @@ if env['NLS']:
 # configuration files
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_dark_theme))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_light_theme))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour3_ui_default.conf'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour3_ui_default.conf'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.menus'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae.menus'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ergonomic-us.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'mnemonic-us.bindings'))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de.bindings'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ergonomic-us.bindings'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'mnemonic-us.bindings'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-de.bindings'))
 # data files
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3'), 'splash.png'))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files))

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index c333b03b615f7a7e7492350f83cad845c22d9dab..1860106b95aa6580dabdcdeba467b5dbc299119e 100644 (file)
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -136,6 +136,7 @@
                        <menuitem action='set-mouse-mode-gain'/>
                        <menuitem action='set-mouse-mode-zoom'/>
                        <menuitem action='set-mouse-mode-timefx'/>
+                       <menuitem action='set-mouse-mode-note'/>
                        <separator/>
                        <menuitem action='cycle-edit-point'/>
                        <menuitem action='cycle-edit-point-with-marker'/>

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index d12165bbb74c38eb4bdbe852fde3bf36faf6f666..6f2ead2b797a8d35e8be380f7e6aca726a5c9272 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -225,8 +225,6 @@ ARDOUR_UI::install_actions ()
        act = ActionManager::register_action (common_actions, X_("RemoveLastCapture"), _("Remove Last Capture"), mem_fun(*this, &ARDOUR_UI::remove_last_capture));
        ActionManager::session_sensitive_actions.push_back (act);
 
-       ActionManager::register_action (common_actions, X_("About"), _("About"),  mem_fun(*this, &ARDOUR_UI::show_splash));
-       
        Glib::RefPtr<ActionGroup> transport_actions = ActionGroup::create (X_("Transport"));
 
        /* do-nothing action for the "transport" menu bar item */

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index 36e2ab7fe1a09afcdc0d5ad4cfaafcecfb711bfe..b7706556ed2366c12a222d6e01c81516b8217bde 100644 (file)
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -405,7 +405,6 @@ Keyboard::setup_keybindings ()
 {
        using namespace ARDOUR_COMMAND_LINE;
        std::string default_bindings = "mnemonic-us.bindings";
-       std::string path;
        vector<string> strs;
 
        binding_files.clear ();
@@ -415,7 +414,7 @@ Keyboard::setup_keybindings ()
        /* set up the per-user bindings path */
        
        strs.push_back (Glib::get_home_dir());
-       strs.push_back (".ardour2");
+       strs.push_back (".ardour3");
        strs.push_back ("ardour.bindings");
 
        user_keybindings_path = Glib::build_filename (strs);
@@ -484,9 +483,7 @@ Keyboard::setup_keybindings ()
 
                        SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
 
-                       find_file_in_search_path (spath, keybindings_path, keybindings_file);
-                       
-                       if (path.empty()) {
+                       if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) {
                                
                                if (keybindings_path == default_bindings) {
                                        error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
@@ -502,7 +499,7 @@ Keyboard::setup_keybindings ()
 
                                /* use it */
 
-                               keybindings_path = path;
+                               keybindings_path = keybindings_file.to_string();
                                break;
                                
                        }

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index df72841affb3e57823dba9c0e2bab924eb2a7daf..0ac2dfc43afe5b7cc430e39be33e09318bd2816f 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -152,6 +152,7 @@ MidiRegionView::canvas_event(GdkEvent* ev)
        
        switch (ev->type) {
        case GDK_KEY_PRESS:
+               cout << "KEY" << endl;
                if (ev->key.keyval == GDK_Delete && !delete_mod) {
                        delete_mod = true;
                        original_mode = trackview.editor.current_midi_edit_mode();

diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in
index 4089b71be4ca493bffb6a5d8c72f1b8f04a39095..a4af4359ab3bcce4afbf9e5fab23959bd30f1e69 100644 (file)
--- a/gtk2_ardour/mnemonic-us.bindings.in
+++ b/gtk2_ardour/mnemonic-us.bindings.in
@@ -91,10 +91,11 @@
 
 ;; HOME ROW
 
-(gtk_accel_path "<Actions>/Editor/zoom-to-region" "z")
+(gtk_accel_path "<Actions>/Editor/zoom-to-region" "<%SECONDARY%>z")
 (gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
 (gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z")
-(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "<%TERTIARY%>z")
+(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "z")
+(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-note" "<%TERTIARY%>n")
 (gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
 (gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
 (gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%WINDOW%>c")

diff --git a/libs/appleutility/SConscript b/libs/appleutility/SConscript
index 68b731c78ed7e12786eff895a2ac76e8f6543d2e..bddca040321884364299aa632b96267e8f8ef648 100644 (file)
--- a/libs/appleutility/SConscript
+++ b/libs/appleutility/SConscript
@@ -17,6 +17,6 @@ appleutility.Append(LINKFLAGS='-framework CoreServices')
 libappleutility = appleutility.SharedLibrary('appleutility', appleutility_files)
 if appleutility['COREAUDIO']:
     Default(libappleutility)
-    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libappleutility))
+    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libappleutility))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'], ['SConscript'] + appleutility_files + glob.glob('*.h') ))

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index b8a003cb0877547b003cd9d35ad681820ac28094..4c13c82cf7e54881186546bb5a322a3e67507997 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -170,7 +170,7 @@ if ardour['LIBLO']:
 ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 ardour.Append(CXXFLAGS="-DDATA_DIR=\\\"" + os.path.join (final_prefix, 'share') + "\\\"")
 ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR']) + "\\\"")
-ardour.Append(CXXFLAGS="-DVAMP_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR'], 'ardour2', 'vamp') + "\\\"")
+ardour.Append(CXXFLAGS="-DVAMP_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR'], 'ardour3', 'vamp') + "\\\"")
 ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\"" + final_config_prefix + "\\\"")
 ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\"" + os.path.join (final_prefix, 'share', 'locale') + "\\\"")
 

diff --git a/libs/cairomm/SConscript b/libs/cairomm/SConscript
index ea22f0ee86e929eb6bcf7f92f5fc247cfd871d28..3af7019e52bc2dfec3e9c0750b6ace1243abe284 100644 (file)
--- a/libs/cairomm/SConscript
+++ b/libs/cairomm/SConscript
@@ -17,7 +17,7 @@ libcairomm = cairomm.SharedLibrary('cairomm', cairomm_files)
 
 Default([libcairomm])
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libcairomm))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libcairomm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript',

diff --git a/libs/clearlooks/SConscript b/libs/clearlooks/SConscript
index feb4f8eeb5ca576a068e5367e7ca3fc304389519..3b496fb3f1a42be258c049d94dbcc826eae3f443 100644 (file)
--- a/libs/clearlooks/SConscript
+++ b/libs/clearlooks/SConscript
@@ -33,7 +33,7 @@ usable_libclearlooks = clearlooks.Install ('engines', libclearlooks)
 Default (usable_libclearlooks)
 
 env.Alias('install',
-          env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'),
+          env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour3', 'engines'),
                       libclearlooks))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],

diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript
index 4d21f3ea54e0f41833bb024d1cda9ca98b1a2bbf..d2509dd4e1d4fa7793b1c119935f6f00738d00be 100644 (file)
--- a/libs/glibmm2/SConscript
+++ b/libs/glibmm2/SConscript
@@ -28,7 +28,7 @@ else :
 
 Default([glibmm2_config_h, libglibmm2])
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libglibmm2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libglibmm2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript',

diff --git a/libs/gtkmm2/atk/SConscript b/libs/gtkmm2/atk/SConscript
index 84a5e8251adfe650e8497d4e4bbea57d665765a7..c1e5fb849ec1e815f904b41bd69b96fd8ee76312 100644 (file)
--- a/libs/gtkmm2/atk/SConscript
+++ b/libs/gtkmm2/atk/SConscript
@@ -13,7 +13,7 @@ atkmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] ])
 libatkmm = atkmm.SharedLibrary('atkmm', atkmm_files)
 Default(libatkmm)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libatkmm))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libatkmm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'atkmm.h'] + 

diff --git a/libs/gtkmm2/gdk/SConscript b/libs/gtkmm2/gdk/SConscript
index 5f86edb04322b269398644205081c5d3ccca528c..dca82665dc97a5e44978f4ac7605416f47873a82 100644 (file)
--- a/libs/gtkmm2/gdk/SConscript
+++ b/libs/gtkmm2/gdk/SConscript
@@ -14,7 +14,7 @@ gdkmm2.Append(CXXFLAGS=["-Ilibs/gtkmm2/gtk", "-DGLIBMM_EXCEPTIONS_ENABLED"])
 libgdkmm2 = gdkmm2.SharedLibrary('gdkmm2', gdkmm2_files)
 Default(libgdkmm2)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgdkmm2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgdkmm2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'gdkmmconfig.h', 'gdkmm.h'] + 

diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript
index d4fc325c2909e7c37ba456534cd206d10bae2f14..32e45a131e4a6b165ecd6ed90387bf533592d82b 100644 (file)
--- a/libs/gtkmm2/gtk/SConscript
+++ b/libs/gtkmm2/gtk/SConscript
@@ -17,7 +17,7 @@ if gtkmm2['IS_OSX']:
 libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
 Default(libgtkmm2)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgtkmm2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgtkmm2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'gtkmmconfig.h', 'gtkmm.h'] + 

diff --git a/libs/gtkmm2/pango/SConscript b/libs/gtkmm2/pango/SConscript
index b08b8b21451e2812b67aec07c462207a482d087e..0e7ccfc5a3a00dd3dfab285cd8f46591da65323b 100644 (file)
--- a/libs/gtkmm2/pango/SConscript
+++ b/libs/gtkmm2/pango/SConscript
@@ -16,7 +16,7 @@ if pangomm['IS_OSX']:
 libpangomm = pangomm.SharedLibrary('pangomm', pangomm_files)
 Default(libpangomm)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpangomm))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libpangomm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'pangomm.h'] + 

diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript
index fad538a40e626d67b213a82d0b16997af2f3da63..2500a9825ada09f3e79a9fbc760c2fee2f6a1190 100644 (file)
--- a/libs/gtkmm2ext/SConscript
+++ b/libs/gtkmm2ext/SConscript
@@ -84,7 +84,7 @@ Default(libgtkmm2ext)
 if env['NLS']:
     i18n (gtkmm2ext, gtkmm2ext_files, env)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgtkmm2ext))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgtkmm2ext))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'i18n.h', 'gettext.h'] +

diff --git a/libs/libgnomecanvasmm/SConscript b/libs/libgnomecanvasmm/SConscript
index 40967cc8d2ed75d1a8927db41cbf042218bd9d04..790762228767544922c52e3a563231253db82850 100644 (file)
--- a/libs/libgnomecanvasmm/SConscript
+++ b/libs/libgnomecanvasmm/SConscript
@@ -24,7 +24,7 @@ if gnomecanvasmm['IS_OSX']:
 libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files)
 Default(libgnomecanvasmm)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgnomecanvasmm))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgnomecanvasmm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'libgnomecanvasmmconfig.h', 'libgnomecanvasmm.h'] +

diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript
index 8401729bb758184943d1af3afccd11d8bdd6c029..63c5285346e8db67b17950306c9c13ab955daa5d 100644 (file)
--- a/libs/libsndfile/SConscript
+++ b/libs/libsndfile/SConscript
@@ -36,7 +36,7 @@ else:
 
 Default([sndfile_h,libsndfile])
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libsndfile))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libsndfile))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',

diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript
index 9d2ce5c95e7d123b821234d7f1366cde17ae27b1..14c02823960d5b1abf51ac2713fd47fe30a95f20 100644 (file)
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -59,7 +59,7 @@ libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
 
 Default(libmidi2)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libmidi2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libmidi2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript' ] + sources + sysdep_sources +

diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index feaabd97ff10668b595daff3be0dc1c4f0a5d98a..94886e3b8219bb53a1068984fc747e3f737a5f06 100644 (file)
--- a/libs/pbd/SConscript
+++ b/libs/pbd/SConscript
@@ -72,7 +72,7 @@ mount_env.Program('mountpoint', 'mountpoint.cc')
 if env['NLS']:
     i18n (pbd, pbd_files, env)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpbd))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libpbd))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'i18n.h', 'gettext.h', 'pbd/abstract_ui.cc' ] +

diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript
index b29aefb0cd807a028e71b621de377ed0f91e1812..cb98513bfc1eade0a086d898cd32eef971174e83 100644 (file)
--- a/libs/sigc++2/SConscript
+++ b/libs/sigc++2/SConscript
@@ -20,7 +20,7 @@ else :
 
 Default([sigc2_config_h,libsigc2])
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libsigc2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libsigc2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',

diff --git a/libs/soundtouch/SConscript b/libs/soundtouch/SConscript
index 9ddee87b0c3457dd6b63cb235b8821f351a2eb6e..417d00b3474978393b2b7ade5e67c2b3debfdbf9 100644 (file)
--- a/libs/soundtouch/SConscript
+++ b/libs/soundtouch/SConscript
@@ -23,7 +23,7 @@ libst = st.SharedLibrary('soundtouch', soundtouch_files)
 
 Default(libst)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libst))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libst))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
        [ 'SConscript'] + soundtouch_files + glob.glob('*.h')))

diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index 026698500a55c9502c4c7dd669f2e8f825f89380..fcc11dbae301797bb3460676dd0f353dd1c81f4c 100644 (file)
--- a/libs/surfaces/control_protocol/SConscript
+++ b/libs/surfaces/control_protocol/SConscript
@@ -50,7 +50,7 @@ Default(libardour_cp)
 if env['NLS']:
        i18n (cp, cp_files, env)
              
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour_cp))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libardour_cp))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +

diff --git a/libs/surfaces/frontier/tranzport/SConscript b/libs/surfaces/frontier/tranzport/SConscript
index 5d390f3e2ffe29b9986f3209f749de846d6029b4..099e35de521e5f32721456f43915bb408be6f48d 100644 (file)
--- a/libs/surfaces/frontier/tranzport/SConscript
+++ b/libs/surfaces/frontier/tranzport/SConscript
@@ -48,7 +48,7 @@ if tranzport['TRANZPORT']:
        Default(libardour_tranzport)
        if env['NLS']:
                i18n (tranzport, tranzport_files, env)
-       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_tranzport))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +

diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index b0921888528961d54ff3545164184f339d8fff45..051a61f148c79efbb57820de57468c6584e0edc0 100644 (file)
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -51,7 +51,7 @@ Default(libardour_genericmidi)
 if env['NLS']:
        i18n (genericmidi, genericmidi_files, env)
              
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_genericmidi))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_genericmidi))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +

diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript
index 4590279807a04246ebe16240998940c4e5276fde..488265892030b9bcfac85bd023e8c7807bdd76a8 100644 (file)
--- a/libs/surfaces/mackie/SConscript
+++ b/libs/surfaces/mackie/SConscript
@@ -69,7 +69,7 @@ if mackie['SURFACES']:
        Default(libardour_mackie)
        if env['NLS']:
                i18n (mackie, mackie_files, env)
-       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2','surfaces'), libardour_mackie))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3','surfaces'), libardour_mackie))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +

diff --git a/libs/surfaces/powermate/SConscript b/libs/surfaces/powermate/SConscript
index 2b4b8c15685d47ef6487ba8903ad0db1c0c8ce2e..504edc603185822b955fc1bb4c3ea047f91beaa9 100644 (file)
--- a/libs/surfaces/powermate/SConscript
+++ b/libs/surfaces/powermate/SConscript
@@ -50,7 +50,7 @@ if env['POWERMATE']:
        if env['NLS']:
                i18n (powermate, powermate_files, env)
              
-       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_powermate))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_powermate))
 
        env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                             [ 'SConscript' ] +

diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
index a154685299477ef7cc93e24a23d71fcd6a59ec89..5e14be31d35da197e9d1989fc643244d786c6430 100644 (file)
--- a/libs/surfaces/tranzport/SConscript
+++ b/libs/surfaces/tranzport/SConscript
@@ -74,7 +74,7 @@ if tranzport['TRANZPORT']:
         i18n (tranzport, tranzport_files, env)
 #    if env['HAVE_TRANZPORT_KERNEL_DRIVER']:
 #        tranzport.Merge([ libraries['usb'] ])
-    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_tranzport))
+    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                      [ 'SConscript' ] +

diff --git a/libs/vamp-plugins/SConscript b/libs/vamp-plugins/SConscript
index a35b789ef305b217a5a24ee0e7e97ee386a39ca9..6b8159bd8c64490923ca999584f4dd5480c63dbb 100644 (file)
--- a/libs/vamp-plugins/SConscript
+++ b/libs/vamp-plugins/SConscript
@@ -18,7 +18,7 @@ libvampplugins = vampplugs.SharedLibrary('ardourvampplugins', plugin_files)
 
 Default(libvampplugins)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'vamp'), libvampplugins))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'vamp'), libvampplugins))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript' ] +

diff --git a/libs/vamp-sdk/SConscript b/libs/vamp-sdk/SConscript
index abf9d86534f19ddf53fb1e444dd84ae2e2b7e8e3..79046e2fc02440e22453deebb25a071c82b52a2d 100644 (file)
--- a/libs/vamp-sdk/SConscript
+++ b/libs/vamp-sdk/SConscript
@@ -34,8 +34,8 @@ libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files)
 Default(libvampsdk)
 Default(libvamphostsdk)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libvampsdk))
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libvamphostsdk))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libvampsdk))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libvamphostsdk))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'COPYING', 'README' ] +

diff --git a/templates/SConscript b/templates/SConscript
index 60a80c5619c2163f9f6fafe197d0e37e2baf47b7..8c7f9885f6c746075784277cc8a135f23292fca6 100644 (file)
--- a/templates/SConscript
+++ b/templates/SConscript
@@ -14,5 +14,5 @@ for template in template_files:
 
 Default(template_build)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'templates'), files))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'templates'), files))
 env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + template_build))

diff --git a/vst/SConscript b/vst/SConscript
index 4a130fed808e47fd859ff71b2d063132fe3153b0..c4254dc5ed2bd7ff3917e761689d04679439ea22 100644 (file)
--- a/vst/SConscript
+++ b/vst/SConscript
@@ -74,7 +74,7 @@ if ardour_vst['VST']:
     # the wine script - into the bin dir
     env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable))
     # the win32 executable - into the lib dir since the wine script will look for it there
-    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), 'ardour_vst.exe.so'))
+    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), 'ardour_vst.exe.so'))
 
 env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                       [ 'SConscript',