Skip to content

Commit e391835

Browse files
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) ........
1 parent 207b4c2 commit e391835

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

configure

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 68924 .
2+
# From configure.in Revision: 70459 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.1.
55
#
@@ -1969,7 +1969,9 @@ if test "${enable_framework+set}" = set; then
19691969
if test "$UNIVERSAL_ARCHS" = "all"
19701970
then
19711971
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"
1972+
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkaltinstallunixtools4way"
19721973
else
1974+
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
19731975
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
19741976
fi
19751977

configure.in

+2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ AC_ARG_ENABLE(framework,
154154
if test "$UNIVERSAL_ARCHS" = "all"
155155
then
156156
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"
157+
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkaltinstallunixtools4way"
157158
else
159+
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
158160
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
159161
fi
160162

0 commit comments

Comments
 (0)