diff options
author | David Robillard <d@drobilla.net> | 2008-02-21 19:30:01 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-02-21 19:30:01 +0000 |
commit | 4d94305cc904cc2cce33d62050f351fe80f0d517 (patch) | |
tree | fcb4bdeb4a6b3e406a577c1818408e858172ca99 /libs/gtkmm2 | |
parent | 0d0bd81a75d23a9d2dd13312f30b7f21138e037a (diff) |
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
Diffstat (limited to 'libs/gtkmm2')
-rw-r--r-- | libs/gtkmm2/atk/SConscript | 2 | ||||
-rw-r--r-- | libs/gtkmm2/gdk/SConscript | 2 | ||||
-rw-r--r-- | libs/gtkmm2/gtk/SConscript | 2 | ||||
-rw-r--r-- | libs/gtkmm2/pango/SConscript | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libs/gtkmm2/atk/SConscript b/libs/gtkmm2/atk/SConscript index 84a5e8251a..c1e5fb849e 100644 --- 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 5f86edb043..dca82665dc 100644 --- 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 d4fc325c29..32e45a131e 100644 --- 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 b08b8b2145..0e7ccfc5a3 100644 --- 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'] + |