Fix for Issue6170: 'make frameworkinstall' failure with python 3.1rc1.

This commit is contained in:
Ronald Oussoren 2009-06-02 10:55:56 +00:00
parent 5c91bf3e93
commit f6ccbf60e5
2 changed files with 3 additions and 3 deletions

4
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 72899 . # From configure.in Revision: 73021 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1. # Generated by GNU Autoconf 2.61 for python 3.1.
# #
@ -1976,7 +1976,7 @@ if test "${enable_framework+set}" = set; then
PYTHONFRAMEWORKPREFIX=$enableval PYTHONFRAMEWORKPREFIX=$enableval
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
FRAMEWORKINSTALLFIRST="frameworkinstallstructure" FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
FRAMEWORKALTINSTALLFIRST="frameworkinstallstructure bininstall maninstall" FRAMEWORKALTINSTALLFIRST="frameworkinstallstructure "
if test "$UNIVERSAL_ARCHS" = "all" if test "$UNIVERSAL_ARCHS" = "all"
then then
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way" FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"

View File

@ -159,7 +159,7 @@ AC_ARG_ENABLE(framework,
PYTHONFRAMEWORKPREFIX=$enableval PYTHONFRAMEWORKPREFIX=$enableval
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
FRAMEWORKINSTALLFIRST="frameworkinstallstructure" FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
FRAMEWORKALTINSTALLFIRST="frameworkinstallstructure bininstall maninstall" FRAMEWORKALTINSTALLFIRST="frameworkinstallstructure "
if test "$UNIVERSAL_ARCHS" = "all" if test "$UNIVERSAL_ARCHS" = "all"
then then
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way" FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps4way frameworkinstallunixtools4way"