From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Mon, 30 Mar 2009 17:53:39 +0000 (+0000)
Subject: Fix issue where 'make altinstall' or 'make install' would install everything
X-Git-Tag: v2.7a1~1741
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb8cb0e192c1da800fee1d08b13534ca3db4d53a;p=python

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 92e6e4807d..328629d351 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 68312 .
+# From configure.in Revision: 70479 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -1972,7 +1972,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 92a04a7b84..acfec69dd7 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