From 04c5e65b8cd52bf10d49375d22ba0908efbaa985 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 16 Oct 2012 21:24:02 -0700
Subject: Redoing the Mac bundling

With the right tools in place you can now create a bundle from the
Makefile by calling "make create-macos-bundle"

In the process of this I also moved the locale directory where we stage
our .mo files to share/locale (which is much more logical).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 packaging/macosx/subsurface.bundle | 3 +++
 packaging/macosx/subsurface.sh     | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'packaging/macosx')

diff --git a/packaging/macosx/subsurface.bundle b/packaging/macosx/subsurface.bundle
index fcfd4f7f1..bff9c962e 100644
--- a/packaging/macosx/subsurface.bundle
+++ b/packaging/macosx/subsurface.bundle
@@ -86,6 +86,9 @@
     ${prefix}/share/locale
   </translations>
 
+  <data dest="${bundle}/Contents/Resources/share/locale">
+    ${project}/Subsurface.app/Contents/Resources/share/locale
+  </data>
 
   <!-- Data to copy in, usually Glade/UI files, images, sounds files
        etc. The destination inside the bundle can be specified if the
diff --git a/packaging/macosx/subsurface.sh b/packaging/macosx/subsurface.sh
index 0652e1afc..d6738abb4 100755
--- a/packaging/macosx/subsurface.sh
+++ b/packaging/macosx/subsurface.sh
@@ -34,7 +34,8 @@ export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
 export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
 export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
 
-APP=name
+APP=$name
+APPlower=`echo $APP | tr '[:upper:]' '[:lower:]'`
 I18NDIR="$bundle_data/locale"
 # Set the locale-related variables appropriately:
 unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE
@@ -48,7 +49,7 @@ if test "$APPLELANGUAGES"; then
     # Test, item per item, to see whether there is an corresponding locale.
     for L in $APPLELANGUAGES; do
 	#test for exact matches:
-       if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then
+       if test -f "$I18NDIR/${L}/LC_MESSAGES/${APPlower}.mo"; then
 	    export LANG=$L
             break
         fi
-- 
cgit v1.2.3-70-g09d2