Skip to content

C
cpython
Commit 586f3a4e authored by Ronald Oussoren's avatar Ronald Oussoren
Browse files
Options

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

parent cc5c0d84
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
configure
View file @ 586f3a4e
#! /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 ...@@ -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"
......
configure.in
View file @ 586f3a4e
...@@ -159,7 +159,7 @@ AC_ARG_ENABLE(framework, ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7