From: Just van Rossum <just@lettererror.com>
Date: Sat, 30 Jan 1999 17:46:34 +0000 (+0000)
Subject: Fixed two typo's (Plugins -> PlugIns) and added some explicit path munging to allow... 
X-Git-Tag: v1.5.2b2~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=786cb11e51ecc5b2cf402badcb3e5f056a65341d;p=thirdparty%2FPython%2Fcpython.git

Fixed two typo's (Plugins -> PlugIns) and added some explicit path munging to allow the script to also work from the Scripts folder. Somehow either of these fixes solved a problem where it suddenly refused to make a PythonCore alias in the Extensions folder. -- jvr
---

diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index 8fd0a3c095a0..3ecc75bba0f8 100644
--- a/Mac/scripts/ConfigurePython.py
+++ b/Mac/scripts/ConfigurePython.py
@@ -89,9 +89,9 @@ def gotopluginfolder():
 	"""Go to the plugin folder, assuming we are somewhere in the Python tree"""
 	import os
 	
-	while not os.path.isdir(":Mac:Plugins"):
+	while not os.path.isdir(":Mac:PlugIns"):
 		os.chdir("::")
-	os.chdir(":Mac:Plugins")
+	os.chdir(":Mac:PlugIns")
 	if verbose: print "current directory is", os.getcwd()
 	
 def loadtoolboxmodules():
@@ -146,8 +146,8 @@ def mkcorealias(src, altsrc):
 	import macostools
 	version = string.split(sys.version)[0]
 	dst = getextensiondirfile(src+ ' ' + version)
-	if not os.path.exists(src):
-		if not os.path.exists(altsrc):
+	if not os.path.exists(os.path.join(sys.exec_prefix, src)):
+		if not os.path.exists(os.path.join(sys.exec_prefix, altsrc)):
 			if verbose:  print '*', src, 'not found'
 			return 0
 		src = altsrc
@@ -155,7 +155,7 @@ def mkcorealias(src, altsrc):
 		os.unlink(dst)
 	except os.error:
 		pass
-	macostools.mkalias(src, dst)
+	macostools.mkalias(os.path.join(sys.exec_prefix, src), dst)
 	if verbose:  print ' ', dst, '->', src
 	return 1