diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2014-05-07 02:41:26 (GMT) |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2014-05-07 02:41:26 (GMT) |
| commit | 9ba90c9f06157bd17dc5ba569e3314832873f260 (patch) | |
| tree | c3c1db1d71116beb6e2cc9201ca1056bc8d09ca1 /configure | |
| parent | 4773b908b129119b081304ef1ef91b0c9a2a5deb (diff) | |
| download | cpython-9ba90c9f06157bd17dc5ba569e3314832873f260.zip cpython-9ba90c9f06157bd17dc5ba569e3314832873f260.tar.gz cpython-9ba90c9f06157bd17dc5ba569e3314832873f260.tar.bz2 | |
- Issue #17752: Fix distutils tests when run from the installed location.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -5326,7 +5326,7 @@ $as_echo_n "checking LDLIBRARY... " >&6; } if test "$enable_framework" then LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' - RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH" + RUNSHARED=DYLD_FRAMEWORK_PATH=`pwd`${DYLD_FRAMEWORK_PATH:+:${DYLD_FRAMEWORK_PATH}} BLDLIBRARY='' else BLDLIBRARY='$(LDLIBRARY)' @@ -5348,13 +5348,13 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h SunOS*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} INSTSONAME="$LDLIBRARY".$SOVERSION ;; Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} case $ac_sys_system in FreeBSD*) SOVERSION=`echo $SOVERSION|cut -d "." -f 1` @@ -5372,12 +5372,12 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h ;; esac BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' - RUNSHARED=SHLIB_PATH=`pwd`:${SHLIB_PATH} + RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}} ;; OSF*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} ;; atheos*) LDLIBRARY='libpython$(VERSION).so' @@ -5387,11 +5387,11 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h Darwin*) LDLIBRARY='libpython$(VERSION).dylib' BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}' + RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}} ;; AIX*) LDLIBRARY='libpython$(VERSION).so' - RUNSHARED=LIBPATH=`pwd`:${LIBPATH} + RUNSHARED=LIBPATH=`pwd`${LIBPATH:+:${LIBPATH}} ;; esac |