diff --git a/packages/darwin_app/embed-MacOSX-dependencies.sh b/packages/darwin_app/embed-MacOSX-dependencies.sh index 5b55401aff8323aed6aca87dd31dc32136cfe54b..318ae79f9a292a2e12b3e8d22da69b5453b0b6e8 100755 --- a/packages/darwin_app/embed-MacOSX-dependencies.sh +++ b/packages/darwin_app/embed-MacOSX-dependencies.sh @@ -78,9 +78,9 @@ for dylib in $PD_APP_LIB/*.dylib; do fi done -# run it again to catch dylibs that depend on dylibs located in /usr/local/opt +# run it again to catch dylibs that depend on dylibs located in /usr/local/ for dylib in $PD_APP_LIB/*.dylib; do - LIBS=`otool -L $dylib | sed -n 's|.*/usr/local/opt/\(.*\.dylib\).*|\1|p'` + LIBS=`otool -L $dylib | sed -n 's|.*/usr/local/\(.*\.dylib\).*|\1|p'` if [ "x$LIBS" != "x" ]; then echo "`echo $dylib | sed 's|.*/\(.*\.dylib\)|\1|'` is using:" for lib in $LIBS; do @@ -89,20 +89,20 @@ for dylib in $PD_APP_LIB/*.dylib; do if [ -e $PD_APP_LIB/$new_lib ]; then echo "$PD_APP_LIB/$new_lib already exists, skipping copy." else - install -vp /usr/local/opt/$lib $PD_APP_LIB + install -vp /usr/local/$lib $PD_APP_LIB fi # @executable_path starts from Contents/Resources/app.nw/bin/pd install_name_tool -id @executable_path/../../../$LIB_DIR/$new_lib $PD_APP_LIB/$new_lib - install_name_tool -change /usr/local/opt/$lib @executable_path/../../../$LIB_DIR/$new_lib $dylib + install_name_tool -change /usr/local/$lib @executable_path/../../../$LIB_DIR/$new_lib $dylib done echo " " fi done # finally, run it one more time to catch dylibs that depend on dylibs from -# /usr/local/lib +# /usr/local/ for dylib in $PD_APP_LIB/*.dylib; do - LIBS=`otool -L $dylib | sed -n 's|.*/usr/local/lib/\(.*\.dylib\).*|\1|p'` + LIBS=`otool -L $dylib | sed -n 's|.*/usr/local/\(.*\.dylib\).*|\1|p'` if [ "x$LIBS" != "x" ]; then echo "`echo $dylib | sed 's|.*/\(.*\.dylib\)|\1|'` is using:" for lib in $LIBS; do @@ -111,11 +111,11 @@ for dylib in $PD_APP_LIB/*.dylib; do if [ -e $PD_APP_LIB/$new_lib ]; then echo "$PD_APP_LIB/$new_lib already exists, skipping copy." else - install -vp /usr/local/lib/$lib $PD_APP_LIB + install -vp /usr/local/$lib $PD_APP_LIB fi # @executable_path starts from Contents/Resources/app.nw/bin/pd install_name_tool -id @executable_path/../../../$LIB_DIR/$new_lib $PD_APP_LIB/$new_lib - install_name_tool -change /usr/local/lib/$lib @executable_path/../../../$LIB_DIR/$new_lib $dylib + install_name_tool -change /usr/local/$lib @executable_path/../../../$LIB_DIR/$new_lib $dylib done echo " " fi