summaryrefslogtreecommitdiffstats
path: root/packaging/macosx
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-04 01:34:23 +0900
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-07-04 01:45:55 +0900
commit9c0cc531755b45859c88f12e661076a9e4310def (patch)
tree2bd43a2ebcf168de22efdb25595404ef605a6e4b /packaging/macosx
parent0482f054a7770ec0daeda47aafbd816cbab02ed8 (diff)
downloadsubsurface-9c0cc531755b45859c88f12e661076a9e4310def.tar.gz
Mac package build: remove obsolete hack
And also add some additional comments. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/macosx')
-rwxr-xr-xpackaging/macosx/make-package.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh
index 6ff1d4cf0..46ca5b599 100755
--- a/packaging/macosx/make-package.sh
+++ b/packaging/macosx/make-package.sh
@@ -37,10 +37,14 @@ for i in libssh libssrfmarblewidget libgit2 libGrantlee_TextDocument.dylib libGr
fi
fi
done
+
+# next, replace @rpath references with @executable_path references in Subsurface
RPATH=$(otool -L ${EXECUTABLE} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- )
for i in ${RPATH}; do
install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE}
done
+
+# and now replace @rpath references in libssrfmarblewidget
MARBLELIB=$(ls Subsurface.app/Contents/Frameworks/libssrfmarblewidget*dylib)
RPATH=$(otool -L ${MARBLELIB} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- )
for i in ${RPATH}; do
@@ -59,7 +63,7 @@ done
#
# -disabled for now as this is still under more investigation-
# cp -a /Users/hohndel/src/tmp/Subsurface.app/Contents Subsurface.app/
-cp ${DIR}/tmp/Subsurface.app/Contents/Frameworks/lib{sql,usb,zip}* Subsurface.app/Contents/Frameworks
+#cp ${DIR}/tmp/Subsurface.app/Contents/Frameworks/lib{sql,usb,zip}* Subsurface.app/Contents/Frameworks
# clean up shared library dependency in the Grantlee plugins
for i in Subsurface.app/Contents/PlugIns/grantlee/5.0/*.so; do