diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-23 22:39:03 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-23 22:39:03 +0000 |
commit | 78b1139d35f913ad4880ed103455e66ba7fd321f (patch) | |
tree | 46442a869e4947ad38ba3ee2e0e0554ec8403864 | |
parent | 66a287b2c2606cd624faf1dab28b48bd842f24af (diff) |
use Primary not Meta for accel maps, having confirmed that it works
git-svn-id: svn://localhost/ardour2/branches/3.0@11514 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rwxr-xr-x | tools/fmt-bindings | 2 | ||||
-rwxr-xr-x | tools/osx_packaging/osx_build | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/fmt-bindings b/tools/fmt-bindings index 0eecd4a4aa..c6b71e4e37 100755 --- a/tools/fmt-bindings +++ b/tools/fmt-bindings @@ -31,7 +31,7 @@ GetOptions ("platform=s" => \$platform, if ($platform eq "darwin") { - $gtk_modifier_map{'PRIMARY'} = 'Meta'; + $gtk_modifier_map{'PRIMARY'} = 'Primary'; $gtk_modifier_map{'SECONDARY'} = 'Control'; $gtk_modifier_map{'TERTIARY'} = 'Shift'; $gtk_modifier_map{'LEVEL4'} = 'Mod1'; diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 2fa6c6d460..b4f78f9c6a 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -296,9 +296,11 @@ cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners for f in *.preset ; do echo ExportFormat: $f; cp "$f" ../tools/osx_packaging/$ExportFormats ; done) -(cd $BUILD_ROOT/templates && \ +(cd $BUILD_ROOT/../templates && \ for f in * ; do - echo Template: $f ; cp -r "$f" ../../tools/osx_packaging/$Templates ; + if [ -d "$f" ] ; then + echo Template: $f ; cp -r "$f" ../tools/osx_packaging/$Templates ; + fi done) # MIDI maps |