diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-03 12:46:30 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-03 12:47:50 -0800 |
| commit | 7d2a7da07919e4287161af60a9ff0482a82e9b7c (patch) | |
| tree | fecc267ed2b67aa9b0c67ac227ce54cebf55e28e | |
| parent | 774f45b98b3a623eed63501c37c66f2131c7e2d6 (diff) | |
| download | subsurface-7d2a7da07919e4287161af60a9ff0482a82e9b7c.tar.gz | |
Small change to the Mac make package script
It still is rather specific to my system layout, but at least removes a
reference to my home directory path...
It also removes @rpath references from the executable. This should in theory
work, but it failed for me on one machine that I tested on and doing things
this way doesn't appear to cause problems.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | packaging/macosx/make-package.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh index 70c9d71de..990d510ed 100755 --- a/packaging/macosx/make-package.sh +++ b/packaging/macosx/make-package.sh @@ -21,7 +21,7 @@ LIBRARY_PATH=${DIR}/install-root/lib make -j8 LIBRARY_PATH=${DIR}/install-root/lib make install # HACK TIME... QtXml is missing. screw this -cp -a /Users/hohndel/Qt/5.5/clang_64/lib/QtXml.framework Subsurface.app/Contents/Frameworks +cp -a $HOME/Qt/5.5/clang_64/lib/QtXml.framework Subsurface.app/Contents/Frameworks rm -rf Subsurface.app/Contents/Frameworks/QtXml.framework/Versions/5/Headers rm -rf Subsurface.app/Contents/Frameworks/QtXml.framework/Headers rm -rf Subsurface.app/Contents/Frameworks/QtXml.framework/QtXml.prl @@ -44,6 +44,10 @@ for i in libssh libssrfmarblewidget libgit2; do install_name_tool -change ${LIBSSH} @executable_path/../Frameworks/${LIBSSH} Subsurface.app/Contents/Frameworks/${SONAME} fi done +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 # next deal with libGrantlee LIBG=Subsurface.app/Contents/Frameworks/libGrantlee_Templates.5.dylib |