[Python-checkins] CVS: distutils/doc/inst inst.tex,1.11,1.12

Greg Ward python-dev@python.org
Wed, 19 Apr 2000 18:44:29 -0400 (EDT)


Update of /projects/cvsroot/distutils/doc/inst
In directory kaluha:/tmp/cvs-serv13349

Modified Files:
	inst.tex 
Log Message:
Reverted '\var' in the "standard installation location" table to '\filevar'.

Index: inst.tex
===================================================================
RCS file: /projects/cvsroot/distutils/doc/inst/inst.tex,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** inst.tex	2000/04/19 22:40:12	1.11
--- inst.tex	2000/04/19 22:44:25	1.12
***************
*** 169,173 ****
  directory, i.e. the top-level subdirectory that the module source
  distribution unpacks into.  For example, if you've just downloaded a
! module source distribution \file{foo-1.0.tar.gz} onto a Unix system, the 
  normal thing to do is:
  \begin{verbatim}
--- 169,173 ----
  directory, i.e. the top-level subdirectory that the module source
  distribution unpacks into.  For example, if you've just downloaded a
! module source distribution \file{foo-1.0.tar.gz} onto a Unix system, the
  normal thing to do is:
  \begin{verbatim}
***************
*** 178,185 ****
  
  On Windows, you'd probably unpack the archive before opening the command
! prompt.  If you downloaded the archive file to \file{C:\textbackslash{}Temp},
! then it probably unpacked (depending on your software) into
! \file{C:\textbackslash{}Temp\textbackslash{}foo-1.0}; from the command prompt window,
! you would then run
  \begin{verbatim}
  cd c:\temp\foo-1.0
--- 178,186 ----
  
  On Windows, you'd probably unpack the archive before opening the command
! prompt.  If you downloaded the archive file to
! \file{C:\textbackslash{}Temp}, then it probably unpacked (depending on
! your software) into
! \file{C:\textbackslash{}Temp\textbackslash{}foo-1.0}; from the command
! prompt window, you would then run
  \begin{verbatim}
  cd c:\temp\foo-1.0
***************
*** 220,225 ****
  \file{build} under the distribution root; if you're excessively
  concerned with speed, or want to keep the source tree pristine, you can
! change the build directory with the \longprogramopt{build-base} option.  For
! example:
  \begin{verbatim}
  python setup.py build --build-base=/tmp/pybuild/foo-1.0
--- 221,226 ----
  \file{build} under the distribution root; if you're excessively
  concerned with speed, or want to keep the source tree pristine, you can
! change the build directory with the \longprogramopt{build-base} option.
! For example:
  \begin{verbatim}
  python setup.py build --build-base=/tmp/pybuild/foo-1.0
***************
*** 270,290 ****
    {Platform}{Standard installation location}{Default value}{Notes}
    \lineiv{Unix (pure)}
!           {\filenq{\var{prefix}/lib/python1.6/site-packages}}
            {\filenq{/usr/local/lib/python1.6/site-packages}}
            {(1)}
    \lineiv{Unix (non-pure)}
!           {\filenq{\var{exec-prefix}/lib/python1.6/site-packages}}
            {\filenq{/usr/local/lib/python1.6/site-packages}}
            {(1)}
    \lineiv{Windows}
!           {\filenq{\var{prefix}}}
            {\filenq{C:\textbackslash{}Python}}
            {(2)}
    \lineiv{Mac~OS (pure)}
!           {\filenq{\var{prefix}:Lib}}
            {\filenq{Python:Lib}  \XXX{???}}
            {}
    \lineiv{Mac~OS (non-pure)}
!           {\var{prefix}:Mac:PlugIns}
            {\filenq{Python:Mac:PlugIns}\XXX{???}}
            {}
--- 271,291 ----
    {Platform}{Standard installation location}{Default value}{Notes}
    \lineiv{Unix (pure)}
!           {\filenq{\filevar{prefix}/lib/python1.6/site-packages}}
            {\filenq{/usr/local/lib/python1.6/site-packages}}
            {(1)}
    \lineiv{Unix (non-pure)}
!           {\filenq{\filevar{exec-prefix}/lib/python1.6/site-packages}}
            {\filenq{/usr/local/lib/python1.6/site-packages}}
            {(1)}
    \lineiv{Windows}
!           {\filenq{\filevar{prefix}}}
            {\filenq{C:\textbackslash{}Python}}
            {(2)}
    \lineiv{Mac~OS (pure)}
!           {\filenq{\filevar{prefix}:Lib}}
            {\filenq{Python:Lib}  \XXX{???}}
            {}
    \lineiv{Mac~OS (non-pure)}
!           {\filevar{prefix}:Mac:PlugIns}
            {\filenq{Python:Mac:PlugIns}\XXX{???}}
            {}
***************
*** 299,304 ****
    \filevar{exec-prefix} are \file{/usr/local}.
  \item[(2)] The default installation directory on Windows was
!   \file{C:\textbackslash{}Program Files\textbackslash{}Python} under Python 1.6a1,
!   1.5.2, and earlier.
  \end{description}
  
--- 300,305 ----
    \filevar{exec-prefix} are \file{/usr/local}.
  \item[(2)] The default installation directory on Windows was
!   \file{C:\textbackslash{}Program Files\textbackslash{}Python} under
!   Python 1.6a1, 1.5.2, and earlier.
  \end{description}
  
***************
*** 398,404 ****
  \end{verbatim}
  
! The \longprogramopt{home} option defines the installation base directory.  Files
! are installed to the following directories under the installation base
! as follows:
  \installscheme{home}{/lib/python}
                {home}{/lib/python}
--- 399,405 ----
  \end{verbatim}
  
! The \longprogramopt{home} option defines the installation base
! directory.  Files are installed to the following directories under the
! installation base as follows:
  \installscheme{home}{/lib/python}
                {home}{/lib/python}
***************
*** 439,449 ****
  \end{verbatim}
  
! In either case, the \longprogramopt{prefix} option defines the installation
! base, and the \longprogramopt{exec-prefix} option defines the platform-specific
! installation base, which is used for platform-specific files.
! (Currently, this just means non-pure module distributions, but could be
! expanded to C libraries, binary executables, etc.)  If
! \longprogramopt{exec-prefix} is not supplied, it defaults to \longprogramopt{prefix}.
! Files are installed as follows:
  
  \installscheme{prefix}{/lib/python1.\filevar{X}/site-packages}
--- 440,450 ----
  \end{verbatim}
  
! In either case, the \longprogramopt{prefix} option defines the
! installation base, and the \longprogramopt{exec-prefix} option defines
! the platform-specific installation base, which is used for
! platform-specific files.  (Currently, this just means non-pure module
! distributions, but could be expanded to C libraries, binary executables,
! etc.)  If \longprogramopt{exec-prefix} is not supplied, it defaults to
! \longprogramopt{prefix}.  Files are installed as follows:
  
  \installscheme{prefix}{/lib/python1.\filevar{X}/site-packages}
***************
*** 452,466 ****
                {prefix}{/share}
  
! There is no requirement that \longprogramopt{prefix} or \longprogramopt{exec-prefix}
! actually point to an alternate Python installation; if the directories
! listed above do not already exist, they are created at installation
! time.
  
  Incidentally, the real reason the prefix scheme is important is simply
  that a standard Unix installation uses the prefix scheme, but with
! \longprogramopt{prefix} and \longprogramopt{exec-prefix} supplied by Python itself (as
! \code{sys.prefix} and \code{sys.exec\_prefix}).  Thus, you might think
! you'll never use the prefix scheme, but every time you run \code{python
!   setup.py install} without any other options, you're using it.
  
  Note that installing extensions to an alternate Python installation has
--- 453,468 ----
                {prefix}{/share}
  
! There is no requirement that \longprogramopt{prefix} or
! \longprogramopt{exec-prefix} actually point to an alternate Python
! installation; if the directories listed above do not already exist, they
! are created at installation time.
  
  Incidentally, the real reason the prefix scheme is important is simply
  that a standard Unix installation uses the prefix scheme, but with
! \longprogramopt{prefix} and \longprogramopt{exec-prefix} supplied by
! Python itself (as \code{sys.prefix} and \code{sys.exec\_prefix}).  Thus,
! you might think you'll never use the prefix scheme, but every time you
! run \code{python setup.py install} without any other options, you're
! using it.
  
  Note that installing extensions to an alternate Python installation has
***************
*** 473,478 ****
  that the two interpreters are the same version of Python (possibly
  different builds, or possibly copies of the same build).  (Of course, if
! your \longprogramopt{prefix} and \longprogramopt{exec-prefix} don't even point to an
! alternate Python installation, this is immaterial.)
  
  
--- 475,480 ----
  that the two interpreters are the same version of Python (possibly
  different builds, or possibly copies of the same build).  (Of course, if
! your \longprogramopt{prefix} and \longprogramopt{exec-prefix} don't even
! point to an alternate Python installation, this is immaterial.)
  
  
***************
*** 482,488 ****
  Since Windows has no conception of a user's home directory, and since
  the standard Python installation under Windows is simpler than that
! under Unix, there's no point in having separate \longprogramopt{prefix} and
! \longprogramopt{home} options.  Just use the \longprogramopt{prefix} option to specify
! a base directory, e.g.
  \begin{verbatim}
  python setup.py install --prefix="\Temp\Python"
--- 484,490 ----
  Since Windows has no conception of a user's home directory, and since
  the standard Python installation under Windows is simpler than that
! under Unix, there's no point in having separate \longprogramopt{prefix}
! and \longprogramopt{home} options.  Just use the \longprogramopt{prefix}
! option to specify a base directory, e.g.
  \begin{verbatim}
  python setup.py install --prefix="\Temp\Python"
***************
*** 491,497 ****
  drive.
  
! The installation base is defined by the \longprogramopt{prefix} option; the
! \longprogramopt{exec-prefix} option is not supported under Windows.  Files are
! installed as follows:
  \installscheme{prefix}{}
                {prefix}{}
--- 493,499 ----
  drive.
  
! The installation base is defined by the \longprogramopt{prefix} option;
! the \longprogramopt{exec-prefix} option is not supported under Windows.
! Files are installed as follows:
  \installscheme{prefix}{}
                {prefix}{}
***************
*** 505,510 ****
  Like Windows, Mac~OS has no notion of home directories (or even of
  users), and a fairly simple standard Python installation.  Thus, only a
! \longprogramopt{prefix} option is needed.  It defines the installation base, and 
! files are installed under it as follows:
  
  \XXX{how do MacPython users run the interpreter with command-line args?}
--- 507,512 ----
  Like Windows, Mac~OS has no notion of home directories (or even of
  users), and a fairly simple standard Python installation.  Thus, only a
! \longprogramopt{prefix} option is needed.  It defines the installation
! base, and files are installed under it as follows:
  
  \XXX{how do MacPython users run the interpreter with command-line args?}
***************
*** 542,555 ****
  installation base directories.  (There are two installation base
  directories, and they are normally the same---they only differ when you
! use the Unix ``prefix scheme'' and supply different \longprogramopt{prefix} and
! \longprogramopt{exec-prefix} options.)
  
  For example, say you're installing a module distribution to your home
  directory under Unix---but you want scripts to go in
! \file{\textasciitilde/scripts} rather than \file{\textasciitilde/bin}.  As you might
! expect, you can override this directory with the
! \longprogramopt{install-scripts} option; in this case, it makes most sense to
! supply a relative path, which will be interpreted relative to the
! installation base directory (your home directory, in this case):
  \begin{verbatim}
  python setup.py install --home --install-scripts=scripts
--- 544,557 ----
  installation base directories.  (There are two installation base
  directories, and they are normally the same---they only differ when you
! use the Unix ``prefix scheme'' and supply different
! \longprogramopt{prefix} and \longprogramopt{exec-prefix} options.)
  
  For example, say you're installing a module distribution to your home
  directory under Unix---but you want scripts to go in
! \file{\textasciitilde/scripts} rather than \file{\textasciitilde/bin}.
! As you might expect, you can override this directory with the
! \longprogramopt{install-scripts} option; in this case, it makes most
! sense to supply a relative path, which will be interpreted relative to
! the installation base directory (your home directory, in this case):
  \begin{verbatim}
  python setup.py install --home --install-scripts=scripts