Merged revisions 72789 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72789 | ronald.oussoren | 2009-05-19 21:29:24 +0200 (Tue, 19 May 2009) | 2 lines
Remove some traces of 'MacPython'
........
diff --git a/Mac/BuildScript/resources/ReadMe.txt b/Mac/BuildScript/resources/ReadMe.txt
index 272824e..67d4525 100644
--- a/Mac/BuildScript/resources/ReadMe.txt
+++ b/Mac/BuildScript/resources/ReadMe.txt
@@ -1,4 +1,4 @@
-This package will install MacPython $FULL_VERSION for Mac OS X
+This package will install Python $FULL_VERSION for Mac OS X
$MACOSX_DEPLOYMENT_TARGET for the following
architecture(s): $ARCHITECTURES.
@@ -12,7 +12,7 @@
though the installer does not enforce this, otherwise
things will not work.
-MacPython consists of the Python programming language
+Python consists of the Python programming language
interpreter, plus a set of programs to allow easy
access to it for Mac users including an integrated development
environment, IDLE, plus a set of pre-built extension modules
@@ -25,8 +25,5 @@
by default you have to add the "bin" directory inside
the framework to you shell's search path.
-More information on MacPython can be found at
-http://www.python.org/download/mac/.
-
More information on Python in general can be found at
http://www.python.org.
diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index 4a998c8..c33fbea 100755
--- a/Mac/BuildScript/scripts/postflight.patch-profile
+++ b/Mac/BuildScript/scripts/postflight.patch-profile
@@ -57,7 +57,7 @@
cp -fp "${RC}" "${RC}.pysave"
fi
echo "" >> "${RC}"
- echo "# Setting PATH for MacPython ${PYVER}" >> "${RC}"
+ echo "# Setting PATH for Python ${PYVER}" >> "${RC}"
echo "# The orginal version is saved in .cshrc.pysave" >> "${RC}"
echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${RC}"
if [ `id -ur` = 0 ]; then
@@ -86,7 +86,7 @@
cp -fp "${PR}" "${PR}.pysave"
fi
echo "" >> "${PR}"
-echo "# Setting PATH for MacPython ${PYVER}" >> "${PR}"
+echo "# Setting PATH for Python ${PYVER}" >> "${PR}"
echo "# The orginal version is saved in `basename ${PR}`.pysave" >> "${PR}"
echo 'PATH="'"${PYTHON_ROOT}/bin"':${PATH}"' >> "${PR}"
echo 'export PATH' >> "${PR}"