summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2009-12-13 21:15:41 (GMT)
committerBrett Cannon <bcannon@gmail.com>2009-12-13 21:15:41 (GMT)
commit85266da5d408e9f35777538e9df426014861acc0 (patch)
treec309512c1a33e214490088aee70058ed58748717
parentba79b35772ab36b3cde0d85c4ec3d1902f47bb79 (diff)
downloadcpython-85266da5d408e9f35777538e9df426014861acc0.zip
cpython-85266da5d408e9f35777538e9df426014861acc0.tar.gz
cpython-85266da5d408e9f35777538e9df426014861acc0.tar.bz2
Make the example paths in Mac/README no longer directly refer to 2.6.
-rw-r--r--Mac/README18
1 files changed, 10 insertions, 8 deletions
diff --git a/Mac/README b/Mac/README
index ec63156..f0f41e9 100644
--- a/Mac/README
+++ b/Mac/README
@@ -48,7 +48,8 @@ will have to do the work yourself if you really want this.
A second reason for using frameworks is that they put Python-related items in
only two places: "/Library/Framework/Python.framework" and
-"/Applications/MacPython 2.6". This simplifies matters for users installing
+"/Applications/MacPython <VERSION>" where ``<VERSION>`` can be e.g. "2.6",
+"3.1", etc.. This simplifies matters for users installing
Python from a binary distribution if they want to get rid of it again. Moreover,
due to the way frameworks work a user without admin privileges can install a
binary distribution in his or her home directory without recompilation.
@@ -75,7 +76,7 @@ PyObjC.
This directory contains a Makefile that will create a couple of python-related
applications (fullblown OSX .app applications, that is) in
-"/Applications/MacPython 2.6", and a hidden helper application Python.app
+"/Applications/MacPython <VERSION>", and a hidden helper application Python.app
inside the Python.framework, and unix tools "python" and "pythonw" into
/usr/local/bin. In addition it has a target "installmacsubtree" that installs
the relevant portions of the Mac subtree into the Python.framework.
@@ -90,16 +91,16 @@ in the sequence
3. make install
This sequence will put the framework in /Library/Framework/Python.framework,
-the applications in "/Applications/MacPython 2.6" and the unix tools in
+the applications in "/Applications/MacPython <VERSION>" and the unix tools in
/usr/local/bin.
Installing in another place, for instance $HOME/Library/Frameworks if you have
no admin privileges on your machine, has only been tested very lightly. This
can be done by configuring with --enable-framework=$HOME/Library/Frameworks.
-The other two directories, "/Applications/MacPython-2.6" and /usr/local/bin,
-will then also be deposited in $HOME. This is sub-optimal for the unix tools,
-which you would want in $HOME/bin, but there is no easy way to fix this right
-now.
+The other two directories, "/Applications/MacPython-<VERSION>" and
+/usr/local/bin, will then also be deposited in $HOME. This is sub-optimal for
+the unix tools, which you would want in $HOME/bin, but there is no easy way to
+fix this right now.
If you want to install some part, but not all, read the main Makefile. The
frameworkinstall is composed of a couple of sub-targets that install the
@@ -107,7 +108,8 @@ framework itself, the Mac subtree, the applications and the unix tools.
There is an extra target frameworkinstallextras that is not part of the
normal frameworkinstall which installs the Demo and Tools directories
-into "/Applications/MacPython 2.6", this is useful for binary distributions.
+into "/Applications/MacPython <VERSION>", this is useful for binary
+distributions.
What do all these programs do?
===============================