Revert bad OS X build change.
authorCarl Hetherington <cth@carlh.net>
Fri, 25 Jul 2014 13:07:51 +0000 (14:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 25 Jul 2014 13:07:51 +0000 (14:07 +0100)
platform/osx/make_dmg.sh

index 92d707d80e2685b2bed2fab67d3b0a7543927810..a9d40c30a94a51d8b5505df0f0e5ab91119b976a 100644 (file)
@@ -112,15 +112,11 @@ for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$mac
   deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)"`
   changes=""
   for dep in $deps; do
-      if [ ! -h "$dep" ]; then
-         echo "Relinking $dep into $obj"
-          base=`basename $dep`
-          # $dep will be a path within 64/; make a 32/ path too
-          dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"`
-          changes="$changes -change $dep @executable_path/../lib/$base -change $dep32 @executable_path/../lib/$base"
-      else
-         echo "Not relinking symlink $dep"
-      fi
+      echo "Relinking $dep into $obj"
+      base=`basename $dep`
+      # $dep will be a path within 64/; make a 32/ path too
+      dep32=`echo $dep | sed -e "s/\/64\//\/32\//g"`
+      changes="$changes -change $dep @executable_path/../lib/$base -change $dep32 @executable_path/../lib/$base"
   done
   if test "x$changes" != "x"; then
     install_name_tool $changes "$obj"