From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Wed, 4 Mar 2009 21:10:17 +0000 (+0000)
Subject: Merged revisions 70167 via svnmerge from
X-Git-Tag: v2.6.2c1~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03674a3855c8094f58019929c25e8d98ae9754af;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 2408960d9499..559b5de15608 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/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(),))
diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index 4aba4b92839e..aa5e93c68302 100755
--- a/Mac/BuildScript/scripts/postflight.patch-profile
+++ b/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