Update of /cvsroot/python/python/dist/src/Doc/inst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5837/Doc/inst Modified Files: Tag: release24-maint inst.tex Log Message: Update refences to "Macintosh" to reflect the state of affairs for OS X and not Mac OS 9. Backport of patch #1095802. Index: inst.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/inst/inst.tex,v retrieving revision 1.58.2.1 retrieving revision 1.58.2.2 diff -u -d -r1.58.2.1 -r1.58.2.2 --- inst.tex 1 Jan 2005 00:34:53 -0000 1.58.2.1 +++ inst.tex 13 Feb 2005 22:56:39 -0000 1.58.2.2 @@ -142,7 +142,7 @@ On \UNIX, you'd run this command from a shell prompt; on Windows, you have to open a command prompt window (``DOS box'') and do it there; on -Mac OS, things are a tad more complicated (see below). +Mac OS X, you open a \command{Terminal} window to get a shell prompt. \subsection{Platform variations} @@ -262,7 +262,8 @@ \code{setup.py install}---then the \command{install} command installs to the standard location for third-party Python modules. This location varies by platform and by how you built/installed Python itself. On -\UNIX{} and Mac OS, it also depends on whether the module distribution +\UNIX{} (and Mac OS X, which is also Unix-based), +it also depends on whether the module distribution being installed is pure Python or contains extensions (``non-pure''): \begin{tableiv}{l|l|l|c}{textrm}% {Platform}{Standard installation location}{Default value}{Notes} @@ -278,14 +279,6 @@ {\filenq{\filevar{prefix}}} {\filenq{C:\textbackslash{}Python}} {(2)} - \lineiv{Mac OS (pure)} - {\filenq{\filevar{prefix}:Lib:site-packages}} - {\filenq{Python:Lib:site-packages}} - {} - \lineiv{Mac OS (non-pure)} - {\filenq{\filevar{prefix}:Lib:site-packages}} - {\filenq{Python:Lib:site-packages}} - {} \end{tableiv} \noindent Notes: @@ -302,8 +295,8 @@ \filevar{prefix} and \filevar{exec-prefix} stand for the directories that Python is installed to, and where it finds its libraries at -run-time. They are always the same under Windows and Mac OS, and very -often the same under \UNIX. You can find out what your Python +run-time. They are always the same under Windows, and very +often the same under \UNIX and Mac OS X. You can find out what your Python installation uses for \filevar{prefix} and \filevar{exec-prefix} by running Python in interactive mode and typing a few simple commands. Under \UNIX, just type \code{python} at the shell prompt. Under @@ -658,7 +651,7 @@ variables supplied by the Distutils are the only ones you can use.) See section~\ref{config-files} for details. -% XXX need some Windows and Mac OS examples---when would custom +% XXX need some Windows examples---when would custom % installation schemes be needed on those platforms? @@ -764,7 +757,7 @@ \label{config-filenames} The names and locations of the configuration files vary slightly across -platforms. On \UNIX, the three configuration files (in the order they +platforms. On \UNIX and Mac OS X, the three configuration files (in the order they are processed) are: \begin{tableiii}{l|l|c}{textrm} {Type of file}{Location and filename}{Notes} @@ -773,7 +766,7 @@ \lineiii{local}{\filenq{setup.cfg}}{(3)} \end{tableiii} -On Windows, the configuration files are: +And on Windows, the configuration files are: \begin{tableiii}{l|l|c}{textrm} {Type of file}{Location and filename}{Notes} \lineiii{system}{\filenq{\filevar{prefix}\textbackslash{}Lib\textbackslash{}distutils\textbackslash{}distutils.cfg}}{(4)} @@ -781,14 +774,6 @@ \lineiii{local}{\filenq{setup.cfg}}{(3)} \end{tableiii} -And on Mac OS, they are: -\begin{tableiii}{l|l|c}{textrm} - {Type of file}{Location and filename}{Notes} - \lineiii{system}{\filenq{\filevar{prefix}:Lib:distutils:distutils.cfg}}{(6)} - \lineiii{personal}{N/A}{} - \lineiii{local}{\filenq{setup.cfg}}{(3)} -\end{tableiii} - \noindent Notes: \begin{description} \item[(1)] Strictly speaking, the system-wide configuration file lives @@ -818,9 +803,6 @@ defined, no personal configuration file will be found or used. (In other words, the Distutils make no attempt to guess your home directory on Windows.) -\item[(6)] (See also notes (1) and (4).) The default installation - prefix is just \file{Python:}, so under Python 1.6 and later this is - normally\file{Python:Lib:distutils:distutils.cfg}. \end{description}