diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 18:00:28 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 18:00:28 (GMT) |
| commit | e391835f35a0829f304877fa50afa2d63adeb99b (patch) | |
| tree | b754e332712a50f5d43e3d4cc2b9955853c70284 | |
| parent | 207b4c227f8d578f9366655232951944eac8725a (diff) | |
| download | cpython-e391835f35a0829f304877fa50afa2d63adeb99b.zip cpython-e391835f35a0829f304877fa50afa2d63adeb99b.tar.gz cpython-e391835f35a0829f304877fa50afa2d63adeb99b.tar.bz2 | |
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)
........
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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 f57c8ae..1a54981 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 |