Merged revisions 70167 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70167 | ronald.oussoren | 2009-03-04 22:07:19 +0100 (Wed, 04 Mar 2009) | 2 lines

  Fix issue 5224.
........

Mac/BuildScript/build-installer.py

@@ -1031,8 +1031,7 @@ def main():
     buildPythonDocs()
     fn = os.path.join(WORKDIR, "_root", "Applications",
                 "Python %s"%(getVersion(),), "Update Shell Profile.command")
-    patchFile("scripts/postflight.patch-profile",  fn)
-    os.chmod(fn, 0755)
+    patchScript("scripts/postflight.patch-profile",  fn)
 
     folder = os.path.join(WORKDIR, "_root", "Applications", "Python %s"%(
         getVersion(),))

Mac/BuildScript/scripts/postflight.patch-profile

@@ -5,8 +5,8 @@ echo "of python is not early enough of the PATH of your shell."
 echo "These changes will be effective only in shell windows that you open"
 echo "after running this script."
 
-PYVER=2.6
-PYTHON_ROOT="/Library/Frameworks/Python.framework/Versions/Current"
+PYVER="@PYVER@"
+PYTHON_ROOT="/Library/Frameworks/Python.framework/Versions/@PYVER@"
 
 if [ `id -ur` = 0 ]; then
 	# Run from the installer, do some trickery to fetch the information