Merge master.

[dcpomatic.git] / run / dcpomatic

diff --git a/run/dcpomatic b/run/dcpomatic
index 9a2f21ea53101c1659adce6fbddd90b456c4b347..74714865ae0b05224e2562b957f3a912aa44c5c6 100755 (executable)
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -64,10 +64,10 @@ if [ `uname -s` == "Darwin" ]; then
   cp icons/kdm_email.png $resources
 
   for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL; do
-    mkdir "$resources/$lang"
-    cp build/src/lib/mo/$lang/*.mo "$resources/$lang"
-    cp build/src/wx/mo/$lang/*.mo "$resources/$lang"
-    cp build/src/tools/mo/$lang/*.mo "$resources/$lang"
+    mkdir -p "$resources/$lang/LC_MESSAGES"
+    cp build/src/lib/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES"
+    cp build/src/wx/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES"
+    cp build/src/tools/mo/$lang/*.mo "$resources/$lang/LC_MESSAGES"
   done
  
   sed -e "s/@VERSION@/test/g" platform/osx/Info.plist.in > $app/Contents/Info.plist
@@ -90,24 +90,24 @@ else
   export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
   if [ "$1" == "--debug" ]; then
       shift
-      gdb --args build/src/tools/dcpomatic $*
+      gdb --args build/src/tools/dcpomatic2 $*
   elif [ "$1" == "--valgrind" ]; then
       shift
-      valgrind --tool="memcheck" build/src/tools/dcpomatic $*
+      valgrind --tool="memcheck" build/src/tools/dcpomatic2 $*
   elif [ "$1" == "--callgrind" ]; then
       shift
-      valgrind --tool="callgrind" build/src/tools/dcpomatic $*
+      valgrind --tool="callgrind" build/src/tools/dcpomatic2 $*
   elif [ "$1" == "--massif" ]; then
       shift
-      valgrind --tool="massif" build/src/tools/dcpomatic $*
+      valgrind --tool="massif" build/src/tools/dcpomatic2 $*
   elif [ "$1" == "--i18n" ]; then
       shift
-      LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic "$*"
+      LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic2 "$*"
   elif [ "$1" == "--perf" ]; then
       shift
-      perf record build/src/tools/dcpomatic $*
+      perf record build/src/tools/dcpomatic2 $*
   else
-      build/src/tools/dcpomatic $*
+      build/src/tools/dcpomatic2 $*
   fi
 fi