diff -r 310613b993d4 Misc/python-config.sh.in --- a/Misc/python-config.sh.in Tue Jul 21 23:28:28 2015 -0500 +++ b/Misc/python-config.sh.in Wed Jul 22 12:41:55 2015 +0200 @@ -12,29 +12,13 @@ exit_with_usage 1 fi -# Returns the actual prefix where this script was installed to. -installed_prefix () -{ - RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) - if which readlink >/dev/null 2>&1 ; then - if readlink -f "$RESULT" >/dev/null 2>&1; then - RESULT=$(readlink -f "$RESULT") - fi - fi - echo $RESULT -} - -prefix_build="@prefix@" -prefix_real=$(installed_prefix "$0") - # Use sed to fix paths from their built-to locations to their installed-to # locations. -prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#") -exec_prefix_build="@exec_prefix@" -exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") -includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#") -libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") -CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") +prefix=$(readlink -f "@prefix@") +exec_prefix=$(readlink -f "@exec_prefix@") +includedir=$(readlink -f "@includedir@") +libdir=$(readlink -f "@libdir@") +CFLAGS=$(readlink -f "@CFLAGS@") VERSION="@VERSION@" LIBM="@LIBM@" LIBC="@LIBC@" @@ -48,7 +32,7 @@ PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" LDVERSION="@LDVERSION@" LIBDEST=${prefix}/lib/python${VERSION} -LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") +LIBPL=$(readlink -f "@LIBPL@") SO="@SO@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"