From 5dc1c1dce2c1b12a572d7b3be0652eda9aa4a7bf Mon Sep 17 00:00:00 2001
From: Benitoite <kd6kxr@gmail.com>
Date: Fri, 7 Feb 2020 13:10:32 -0800
Subject: [PATCH] Mac: install_name change after CheckLink

---
 tools/osx/macosx_bundle.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/osx/macosx_bundle.sh b/tools/osx/macosx_bundle.sh
index eae8a2021..b8554a6e3 100644
--- a/tools/osx/macosx_bundle.sh
+++ b/tools/osx/macosx_bundle.sh
@@ -124,6 +124,9 @@ ditto ${LOCAL_PREFIX}/local/lib/liblensfun.2.dylib "${CONTENTS}/Frameworks/lible
 # Copy libomp to Frameworks
 ditto ${LOCAL_PREFIX}/local/lib/libomp.dylib "${CONTENTS}/Frameworks"
 
+msg "Copying dependencies from ${GTK_PREFIX}:"
+CheckLink "${EXECUTABLE}"
+
 # dylib install names
 find -E "${CONTENTS}" -type f -regex '.*/(rawtherapee-cli|rawtherapee|.*\.(dylib))' | while read -r x; do
     msg "Modifying dylib install names: ${x}"
@@ -137,9 +140,6 @@ find -E "${CONTENTS}" -type f -regex '.*/(rawtherapee-cli|rawtherapee|.*\.(dylib
     } | bash -v
 done
 
-msg "Copying dependencies from ${GTK_PREFIX}:"
-CheckLink "${EXECUTABLE}"
-
 # Copy libjpeg-turbo ("62") into the app bundle
 ditto ${LOCAL_PREFIX}/local/lib/libjpeg.62.dylib "${CONTENTS}/Frameworks/libjpeg.62.dylib"
 
@@ -273,6 +273,12 @@ find -E "${CONTENTS}" -type f -regex '.*/(rawtherapee-cli|rawtherapee|.*\.(dylib
     } | bash -v
 done
 
+# fix @rpath in Frameworks
+msg "Registering @rpath in Frameworks folder:"
+for frameworklibs in ${CONTENTS}/Frameworks/* ; do
+    echo "   install_name_tool -delete_rpath /opt/local/lib '${frameworklibs}'" | bash -v
+    echo "   install_name_tool -add_rpath /Applications/RawTherapee.app/Contents/Frameworks '${frameworklibs}'" | bash -v
+done
 
 # Sign the app
 msg "Codesigning:"