Skip to content

Commit 0955419

Browse files
author
ronald.oussoren
committed
Fix a glaring error and update some version numbers.
git-svn-id: http://svn.python.org/projects/python/trunk@51805 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent d4ac873 commit 0955419

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

Mac/README

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ will have to do the work yourself if you really want this.
4848

4949
A second reason for using frameworks is that they put Python-related items in
5050
only two places: "/Library/Framework/Python.framework" and
51-
"/Applications/MacPython 2.5". This simplifies matters for users installing
51+
"/Applications/MacPython 2.6". This simplifies matters for users installing
5252
Python from a binary distribution if they want to get rid of it again. Moreover,
5353
due to the way frameworks work a user without admin privileges can install a
5454
binary distribution in his or her home directory without recompilation.
@@ -75,7 +75,7 @@ PyObjC.
7575

7676
This directory contains a Makefile that will create a couple of python-related
7777
applications (fullblown OSX .app applications, that is) in
78-
"/Applications/MacPython 2.3", and a hidden helper application Python.app
78+
"/Applications/MacPython 2.6", and a hidden helper application Python.app
7979
inside the Python.framework, and unix tools "python" and "pythonw" into
8080
/usr/local/bin. In addition it has a target "installmacsubtree" that installs
8181
the relevant portions of the Mac subtree into the Python.framework.
@@ -90,28 +90,24 @@ in the sequence
9090
3. make install
9191

9292
This sequence will put the framework in /Library/Framework/Python.framework,
93-
the applications in /Applications/MacPython 2.5 and the unix tools in
93+
the applications in "/Applications/MacPython 2.6" and the unix tools in
9494
/usr/local/bin.
9595

9696
Installing in another place, for instance $HOME/Library/Frameworks if you have
9797
no admin privileges on your machine, has only been tested very lightly. This
9898
can be done by configuring with --enable-framework=$HOME/Library/Frameworks.
99-
The other two directories, /Applications/MacPython-2.3 and /usr/local/bin, will
100-
then also be deposited in $HOME. This is sub-optimal for the unix tools, which
101-
you would want in $HOME/bin, but there is no easy way to fix this right now.
102-
103-
Note that there are no references to the actual locations in the code or
104-
resource files, so you are free to move things around afterwards. For example,
105-
you could use --enable-framework=/tmp/newversion/Library/Frameworks and use
106-
/tmp/newversion as the basis for an installer or something.
99+
The other two directories, "/Applications/MacPython-2.6" and /usr/local/bin,
100+
will then also be deposited in $HOME. This is sub-optimal for the unix tools,
101+
which you would want in $HOME/bin, but there is no easy way to fix this right
102+
now.
107103

108104
If you want to install some part, but not all, read the main Makefile. The
109105
frameworkinstall is composed of a couple of sub-targets that install the
110106
framework itself, the Mac subtree, the applications and the unix tools.
111107

112108
There is an extra target frameworkinstallextras that is not part of the
113109
normal frameworkinstall which installs the Demo and Tools directories
114-
into /Applications/MacPython-2.3, this is useful for binary distributions.
110+
into "/Applications/MacPython 2.6", this is useful for binary distributions.
115111

116112
What do all these programs do?
117113
===============================

0 commit comments

Comments
 (0)