* Ensure that "make altinstall" works when the tree was configured
with --enable-framework
* Also for --enable-framework: allow users to use --prefix to specify
the location of the compatibility symlinks (such as /usr/local/bin/python)
diff --git a/configure.in b/configure.in
index b3a5ae2..be50d07 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,9 @@
PYTHONFRAMEWORKINSTALLDIR=
FRAMEWORKINSTALLFIRST=
FRAMEWORKINSTALLLAST=
+ FRAMEWORKALTINSTALLFIRST=
+ FRAMEWORKALTINSTALLLAST=
+ FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
enable_framework=
;;
*)
@@ -108,6 +111,9 @@
PYTHONFRAMEWORKINSTALLDIR=$PYTHONFRAMEWORKPREFIX/$PYTHONFRAMEWORKDIR
FRAMEWORKINSTALLFIRST="frameworkinstallstructure"
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
+ FRAMEWORKALTINSTALLFIRST="${FRAMEWORKINSTALLFIRST} bininstall maninstall"
+ FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
+ FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
# Add makefiles for Mac specific code to the list of output
@@ -123,6 +129,9 @@
PYTHONFRAMEWORKINSTALLDIR=
FRAMEWORKINSTALLFIRST=
FRAMEWORKINSTALLLAST=
+ FRAMEWORKALTINSTALLFIRST=
+ FRAMEWORKALTINSTALLLAST=
+ FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
enable_framework=
])
AC_SUBST(PYTHONFRAMEWORK)
@@ -131,6 +140,9 @@
AC_SUBST(PYTHONFRAMEWORKINSTALLDIR)
AC_SUBST(FRAMEWORKINSTALLFIRST)
AC_SUBST(FRAMEWORKINSTALLLAST)
+AC_SUBST(FRAMEWORKALTINSTALLFIRST)
+AC_SUBST(FRAMEWORKALTINSTALLLAST)
+AC_SUBST(FRAMEWORKUNIXTOOLSPREFIX)
##AC_ARG_WITH(dyld,
## AC_HELP_STRING(--with-dyld,