diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-07 19:06:01 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-06-07 19:06:01 +0000 |
| commit | b0cc7a4e572713ee4526e8f04c5c3de0415f81ff (patch) | |
| tree | bc7666aa34842fc52f986155aeb4d8a74ae3c369 /configure.in | |
| parent | b150d7ff00d455f44613bc04bef83ada95a97366 (diff) | |
| download | cpython-b0cc7a4e572713ee4526e8f04c5c3de0415f81ff.tar.gz | |
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 be50d07971..6a8bc82690 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) |