summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstopiccot <alexey.petruchik@gmail.com>2015-03-09 22:46:22 +0300
committerDaniel Stenberg <daniel@haxx.se>2015-03-09 23:39:27 +0100
commit0f24df6e54c193941f04c1c2378ef09366002f2f (patch)
tree760babcb40a7f1e7cd7ff2e446b306698dc3373c
parente662ddff497e12afc1a49863d56efc08f62d8ff9 (diff)
downloadcurl-0f24df6e54c193941f04c1c2378ef09366002f2f.tar.gz
MacOSX-Framework: use @rpath instead of @executable_path
Bug: https://github.com/bagder/curl/pull/157
-rwxr-xr-xMacOSX-Framework4
1 files changed, 2 insertions, 2 deletions
diff --git a/MacOSX-Framework b/MacOSX-Framework
index 9863b78ee..6251bff2e 100755
--- a/MacOSX-Framework
+++ b/MacOSX-Framework
@@ -94,7 +94,7 @@ if test ! -z $SDK32; then
rm -r libcurl.framework
mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Resources
cp lib/.libs/libcurl.dylib libcurl.framework/${FRAMEWORK_VERSION}/libcurl
- install_name_tool -id @executable_path/../Frameworks/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl
+ install_name_tool -id @rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl
/usr/bin/sed -e "s/7\.12\.3/$VERSION/" lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist
mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
@@ -121,7 +121,7 @@ if test ! -z $SDK32; then
echo "----Appending 64 bit framework to 32 bit framework..."
cp lib/.libs/libcurl.dylib libcurl.framework/${FRAMEWORK_VERSION}/libcurl64
- install_name_tool -id @executable_path/../Frameworks/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl64
+ install_name_tool -id @rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl64
cp libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl32
pwd
lipo libcurl.framework/${FRAMEWORK_VERSION}/libcurl32 libcurl.framework/${FRAMEWORK_VERSION}/libcurl64 -create -output libcurl.framework/${FRAMEWORK_VERSION}/libcurl