More OS X fixes.

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 274a5cfc1eb65c283e8047047a72e8f28b84958a..6656a26da4010573debc4623b9f72d3c8f603c02 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -21,6 +21,10 @@ approot="$appdir/Contents"
 libs="$approot/lib"
 macos="$approot/MacOS"
 resources="$approot/Resources"
+rm -rf "$WORK/$appdir"
+mkdir -p "$WORK/$macos"
+mkdir -p "$WORK/$libs"
+mkdir -p "$WORK/$resources"
 
 # KDM creator
 appdir_kdm="DCP-o-matic 2 KDM Creator.app"
@@ -28,11 +32,8 @@ approot_kdm="$appdir_kdm/Contents"
 libs_kdm="$approot_kdm/lib"
 macos_kdm="$approot_kdm/MacOS"
 resources_kdm="$approot_kdm/Resources"
-
-rm -rf "$WORK/$appdir"
-mkdir -p "$WORK/$macos"
-mkdir -p "$WORK/$libs"
-mkdir -p "$WORK/$resources"
+rm -rf "$WORK/$appdir_kdm"
+mkdir -p "$WORK/$macos_kdm"
 
 relink="dcpomatic"
 
@@ -186,11 +187,9 @@ approot_kdm="$appdir_kdm/Contents"
 libs_kdm="$approot_kdm/lib"
 macos_kdm="$approot_kdm/MacOS"
 resources_kdm="$approot_kdm/Resources"
-rm -rf "$WORK/$appdir_kdm"
-mkdir -p "$WORK/$macos_kdm"
-ln -s "../../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_kdm"
-ln -s "../../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_kdm"
-cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$WORK/$approot/Info.plist"
+ln -s "../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_kdm"
+ln -s "../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_kdm"
+cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$WORK/$approot_kdm/Info.plist"
 cp -a "$WORK/$appdir_kdm" $WORK/$vol_name
 
 rm -f $tmp_dmg "$dmg"