From 2df813fc4027c5cc766eb897e7d1879127ae03ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Mon, 4 Mar 2019 10:30:25 +0100 Subject: [PATCH] Really fix relocate.sh for macOS --- relocate.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/relocate.sh.in b/relocate.sh.in index 38040c1..23d9f93 100755 --- a/relocate.sh.in +++ b/relocate.sh.in @@ -4,9 +4,9 @@ CURRENT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$CURRENT_ROOT" if [ "${PLATFORM}" == "macos" ]; then - REPLACE_FILES="pyside/lib/cmake/**/*.cmake pyside/lib/pkgconfig/*.pc qt/lib/pkgconfig/*.pc python/lib/pkgconfig/*.pc" -else REPLACE_FILES="pyside/lib/cmake/**/*.cmake pyside/lib/pkgconfig/*.pc qt/lib/pkgconfig/*.pc python/Python.framework/Versions/Current/lib/pkgconfig/*.pc" +else + REPLACE_FILES="pyside/lib/cmake/**/*.cmake pyside/lib/pkgconfig/*.pc qt/lib/pkgconfig/*.pc python/lib/pkgconfig/*.pc" fi ORIGINAL_ROOT_ESCAPED="${ORIGINAL_ROOT////\\/}" @@ -15,7 +15,7 @@ CURRENT_ROOT_ESCAPED="${CURRENT_ROOT////\\/}" for file in $REPLACE_FILES; do echo "Relocating $file" if [ "${PLATFORM}" == "macos" ]; then - sed -i".original" "s/$ORIGINAL_ROOT_ESCAPED/$CURRENT_ROOT_ESCAPED/g" -e "$file" + sed -i".original" -e "s/$ORIGINAL_ROOT_ESCAPED/$CURRENT_ROOT_ESCAPED/g" "$file" else sed -i -e "s/$ORIGINAL_ROOT_ESCAPED/$CURRENT_ROOT_ESCAPED/g" "$file" fi