From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 30 Mar 2009 18:00:28 +0000 (+0000)
Subject: Merged revisions 70730 via svnmerge from
X-Git-Tag: v3.1a2~165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e391835f35a0829f304877fa50afa2d63adeb99b;p=python

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)
........
---

diff --git a/configure b/configure
index 85db6d60f2..ff266aa3a0 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 68924 .
+# From configure.in Revision: 70459 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -1969,7 +1969,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
 
diff --git a/configure.in b/configure.in
index f57c8ae8a5..1a54981aee 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