diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-07 19:06:01 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-07 19:06:01 (GMT) |
| commit | 2db3a8f73ea74dd9403ce558e360f4583419a998 (patch) | |
| tree | c4b77be7fe3c09750f806bb704e77401f22a66e0 /configure.in | |
| parent | 32f5d8f1b153be33be42df82eb0f04c42006db54 (diff) | |
| download | cpython-2db3a8f73ea74dd9403ce558e360f4583419a998.zip cpython-2db3a8f73ea74dd9403ce558e360f4583419a998.tar.gz cpython-2db3a8f73ea74dd9403ce558e360f4583419a998.tar.bz2 | |
And the last bit: move IDLE one level up and adjust makefiles
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/configure.in b/configure.in index be50d07..6a8bc82 100644 --- a/configure.in +++ b/configure.in @@ -101,7 +101,11 @@ AC_ARG_ENABLE(framework, FRAMEWORKINSTALLLAST= FRAMEWORKALTINSTALLFIRST= FRAMEWORKALTINSTALLLAST= - FRAMEWORKUNIXTOOLSPREFIX="${prefix}" + if test "x${prefix}" = "xNONE"; then + FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}" + else + FRAMEWORKUNIXTOOLSPREFIX="${prefix}" + fi enable_framework= ;; *) @@ -113,14 +117,18 @@ AC_ARG_ENABLE(framework, FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools" FRAMEWORKALTINSTALLFIRST="${FRAMEWORKINSTALLFIRST} bininstall maninstall" FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools" - FRAMEWORKUNIXTOOLSPREFIX="${prefix}" + if test "x${prefix}" = "xNONE" ; then + FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}" + else + FRAMEWORKUNIXTOOLSPREFIX="${prefix}" + fi prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION # Add makefiles for Mac specific code to the list of output # files: - AC_CONFIG_FILES(Mac/OSX/Makefile) - AC_CONFIG_FILES(Mac/OSX/PythonLauncher/Makefile) - AC_CONFIG_FILES(Mac/OSX/IDLE/Makefile) + AC_CONFIG_FILES(Mac/Makefile) + AC_CONFIG_FILES(Mac/PythonLauncher/Makefile) + AC_CONFIG_FILES(Mac/IDLE/Makefile) esac ],[ PYTHONFRAMEWORK= @@ -131,7 +139,11 @@ AC_ARG_ENABLE(framework, FRAMEWORKINSTALLLAST= FRAMEWORKALTINSTALLFIRST= FRAMEWORKALTINSTALLLAST= - FRAMEWORKUNIXTOOLSPREFIX="${prefix}" + if test "x${prefix}" = "xNONE" ; then + FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}" + else + FRAMEWORKUNIXTOOLSPREFIX="${prefix}" + fi enable_framework= ]) AC_SUBST(PYTHONFRAMEWORK) |