diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 17:56:14 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 17:56:14 +0000 |
| commit | 75d838532b107712778933b0f7979f5339fb5b08 (patch) | |
| tree | c62becf5772426a2e7eba9e9dddc0bf9ddb9b130 | |
| parent | d14b6005233138db60fdea4213455042a53ca538 (diff) | |
| download | cpython-git-75d838532b107712778933b0f7979f5339fb5b08.tar.gz | |
Merged revisions 70730 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70730 | ronald.oussoren | 2009-03-30 12:53:39 -0500 (Mon, 30 Mar 2009) | 3 lines
Fix issue where 'make altinstall' or 'make install' would install everything
that needs to be installed on OSX (depending on the configure flags)
........
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 68147 . +# From configure.in Revision: 68599 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 2.6. # @@ -1970,7 +1970,9 @@ if test "${enable_framework+set}" = set; then if test "$UNIVERSAL_ARCHS" = "all" then FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way" + FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkaltinstallunixtools4way" else + FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools" FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools" fi @@ -2256,7 +2258,7 @@ echo $ECHO_N "checking for --without-gcc... $ECHO_C" >&6; } if test "${with_gcc+set}" = set; then withval=$with_gcc; case $withval in - no) CC=cc + no) CC=${CC:-cc} without_gcc=yes;; yes) CC=gcc without_gcc=no;; diff --git a/configure.in b/configure.in index 39317f43ee..1caad537e1 100644 --- a/configure.in +++ b/configure.in @@ -154,7 +154,9 @@ AC_ARG_ENABLE(framework, if test "$UNIVERSAL_ARCHS" = "all" then FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way" + FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkaltinstallunixtools4way" else + FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools" FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools" fi |