diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-06 19:50:24 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-06 19:50:24 (GMT) |
| commit | 5b78732a20b1e8210cbc3bad7067e52fb969007f (patch) | |
| tree | 6bf65b7ec378cea8a8dac763a6323495cb6c9b8f /configure.in | |
| parent | b1998bc860169c02a23fce874f538cf009d351de (diff) | |
| download | cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.zip cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.tar.gz cpython-5b78732a20b1e8210cbc3bad7067e52fb969007f.tar.bz2 | |
* 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)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/configure.in b/configure.in index b3a5ae2..be50d07 100644 --- a/configure.in +++ b/configure.in @@ -99,6 +99,9 @@ AC_ARG_ENABLE(framework, PYTHONFRAMEWORKINSTALLDIR= FRAMEWORKINSTALLFIRST= FRAMEWORKINSTALLLAST= + FRAMEWORKALTINSTALLFIRST= + FRAMEWORKALTINSTALLLAST= + FRAMEWORKUNIXTOOLSPREFIX="${prefix}" enable_framework= ;; *) @@ -108,6 +111,9 @@ AC_ARG_ENABLE(framework, 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 @@ AC_ARG_ENABLE(framework, PYTHONFRAMEWORKINSTALLDIR= FRAMEWORKINSTALLFIRST= FRAMEWORKINSTALLLAST= + FRAMEWORKALTINSTALLFIRST= + FRAMEWORKALTINSTALLLAST= + FRAMEWORKUNIXTOOLSPREFIX="${prefix}" enable_framework= ]) AC_SUBST(PYTHONFRAMEWORK) @@ -131,6 +140,9 @@ AC_SUBST(PYTHONFRAMEWORKPREFIX) 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, |