mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 70730 via svnmerge from

Browse source 
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)
........
This commit is contained in:
Ronald Oussoren 2009-03-30 17:56:14 +00:00
parent d14b600523
commit 75d838532b
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 68147 . # From configure.in Revision: 68599 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 2.6. # 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" if test "$UNIVERSAL_ARCHS" = "all"
then then
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way" FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkaltinstallunixtools4way"
else else
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools" FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
fi fi
@ -2256,7 +2258,7 @@ echo $ECHO_N "checking for --without-gcc... $ECHO_C" >&6; }
if test "${with_gcc+set}" = set; then if test "${with_gcc+set}" = set; then
withval=$with_gcc; withval=$with_gcc;
case $withval in case $withval in
no) CC=cc no) CC=${CC:-cc}
without_gcc=yes;; without_gcc=yes;;
yes) CC=gcc yes) CC=gcc
without_gcc=no;; without_gcc=no;;

2
configure.in
View file

@ -154,7 +154,9 @@ AC_ARG_ENABLE(framework,
if test "$UNIVERSAL_ARCHS" = "all" if test "$UNIVERSAL_ARCHS" = "all"
then then
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way" FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkaltinstallunixtools4way"
else else
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools" FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
fi fi