X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fosx%2Fmake_dmg.sh;h=5500c42678c048599783376aaac640eefe1070ed;hb=04eebe07e2f64bd15f6887a10ab51fb92c52901a;hp=750d13962ea4ad78dde85b8a6d88ec59141095fb;hpb=e8eec728447f63439281edd623e586e99251f352;p=dcpomatic.git

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 750d13962..5500c4267 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -109,15 +109,14 @@ universal_copy_lib $ENV libcairo "$WORK/$libs"
 relink=`echo $relink | sed -e "s/\+//g"`
 
 for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$macos/dcpomatic2_cli" "$WORK/$macos/dcpomatic2_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do
-  deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)"`
+  deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost)"`
   changes=""
   for dep in $deps; do
-      if [ ! -h "$dep" ]; then
-          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"
-      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"