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

diff --git a/tools/fmt-bindings b/tools/fmt-bindings
index 0eecd4a4aa3f675768223dda5a827150db386049..c6b71e4e372d6b063ee371417aaf4ca9e6a2f6ab 100755 (executable)
--- 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 2fa6c6d4602fc93b4cb041955f87e5f5e7952f37..b4f78f9c6a91c5e3a6b8d9859265da25238e9e9e 100755 (executable)
--- 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