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 85db6d60f2437fb478cbcb0d853d7c808da45785..ff266aa3a0bc0cafd25cd5413cb0cc4a9b24728b 100755 (executable)
--- 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 f57c8ae8a5e4e9a607606b3d56e44a932377b083..1a54981aeecc078d9fb9089efa9d3204fda2d3b7 100644 (file)
--- 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