commit 2db3a8f73ea74dd9403ce558e360f4583419a998
author Ronald Oussoren <ronaldoussoren@mac.com> Wed Jun 07 19:06:01 2006 +0000
committer Ronald Oussoren <ronaldoussoren@mac.com> Wed Jun 07 19:06:01 2006 +0000
tree c4b77be7fe3c09750f806bb704e77401f22a66e0
parent 32f5d8f1b153be33be42df82eb0f04c42006db54

And the last bit: move IDLE one level up and adjust makefiles

configure

diff --git a/configure b/configure
index b2e10d4..1b94a91 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 46608 .
+# From configure.in Revision: 46700 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.5.
 #
@@ -1447,7 +1447,11 @@
 		FRAMEWORKINSTALLLAST=
 		FRAMEWORKALTINSTALLFIRST=
 		FRAMEWORKALTINSTALLLAST=
-		FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
+		if test "x${prefix}" = "xNONE"; then
+			FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}"
+		else
+			FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
+		fi
 		enable_framework=
 		;;
 	*)
@@ -1459,16 +1463,20 @@
 		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="$ac_config_files Mac/OSX/Makefile"
+		          ac_config_files="$ac_config_files Mac/Makefile"
 
-		          ac_config_files="$ac_config_files Mac/OSX/PythonLauncher/Makefile"
+		          ac_config_files="$ac_config_files Mac/PythonLauncher/Makefile"
 
-		          ac_config_files="$ac_config_files Mac/OSX/IDLE/Makefile"
+		          ac_config_files="$ac_config_files Mac/IDLE/Makefile"
 
 	esac
 
@@ -1482,7 +1490,11 @@
 	FRAMEWORKINSTALLLAST=
 	FRAMEWORKALTINSTALLFIRST=
 	FRAMEWORKALTINSTALLLAST=
-	FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
+	if test "x${prefix}" = "xNONE" ; then
+		FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}"
+	else
+		FRAMEWORKUNIXTOOLSPREFIX="${prefix}"
+	fi
 	enable_framework=
 
 fi;
@@ -22477,9 +22489,9 @@
 do
   case "$ac_config_target" in
   # Handling of arguments.
-  "Mac/OSX/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/OSX/Makefile" ;;
-  "Mac/OSX/PythonLauncher/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/OSX/PythonLauncher/Makefile" ;;
-  "Mac/OSX/IDLE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/OSX/IDLE/Makefile" ;;
+  "Mac/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/Makefile" ;;
+  "Mac/PythonLauncher/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/PythonLauncher/Makefile" ;;
+  "Mac/IDLE/Makefile" ) CONFIG_FILES="$CONFIG_FILES Mac/IDLE/Makefile" ;;
   "Makefile.pre" ) CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
   "Modules/Setup.config" ) CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
   "pyconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pyconfig.h" ;;