From dce7e46766f5acb8d4723f0b126df120e17051dd Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 19 May 2018 19:52:46 -0700 Subject: Mac: don't try to copy libraries we got from Homebrew Signed-off-by: Dirk Hohndel --- packaging/macosx/make-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh index ba717bdb2..e1da0fc75 100755 --- a/packaging/macosx/make-package.sh +++ b/packaging/macosx/make-package.sh @@ -26,7 +26,7 @@ LIBRARY_PATH=${DIR}/install-root/lib make install EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\ -f1 | tr -d "\t") - if [ ! -z ${OLD} ] ; then + if [[ ! -z ${OLD} && ! -f Subsurface.app/Contents/Frameworks/$(basename ${OLD}) ]] ; then # copy the library into the bundle and make sure its id and the reference to it are correct cp ${DIR}/install-root/lib/$(basename ${OLD}) Subsurface.app/Contents/Frameworks SONAME=$(basename $OLD) -- cgit v1.2.3-70-g09d2