mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
123 lines
4.5 KiB
Diff
123 lines
4.5 KiB
Diff
Index: inst/inst.tex
|
|
===================================================================
|
|
--- inst/inst.tex (Revision 54633)
|
|
+++ inst/inst.tex (Arbeitskopie)
|
|
@@ -324,32 +324,6 @@
|
|
section~\ref{custom-install} on custom installations.
|
|
|
|
|
|
-% This rather nasty macro is used to generate the tables that describe
|
|
-% each installation scheme. It's nasty because it takes two arguments
|
|
-% for each "slot" in an installation scheme, there will soon be more
|
|
-% than five of these slots, and TeX has a limit of 10 arguments to a
|
|
-% macro. Uh-oh.
|
|
-
|
|
-\newcommand{\installscheme}[8]
|
|
- {\begin{tableiii}{l|l|l}{textrm}
|
|
- {Type of file}
|
|
- {Installation Directory}
|
|
- {Override option}
|
|
- \lineiii{pure module distribution}
|
|
- {\filevar{#1}\filenq{#2}}
|
|
- {\longprogramopt{install-purelib}}
|
|
- \lineiii{non-pure module distribution}
|
|
- {\filevar{#3}\filenq{#4}}
|
|
- {\longprogramopt{install-platlib}}
|
|
- \lineiii{scripts}
|
|
- {\filevar{#5}\filenq{#6}}
|
|
- {\longprogramopt{install-scripts}}
|
|
- \lineiii{data}
|
|
- {\filevar{#7}\filenq{#8}}
|
|
- {\longprogramopt{install-data}}
|
|
- \end{tableiii}}
|
|
-
|
|
-
|
|
\section{Alternate Installation}
|
|
\label{alt-install}
|
|
|
|
@@ -399,10 +373,23 @@
|
|
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}
|
|
- {home}{/bin}
|
|
- {home}{/share}
|
|
+\begin{tableiii}{l|l|l}{textrm}
|
|
+ {Type of file}
|
|
+ {Installation Directory}
|
|
+ {Override option}
|
|
+ \lineiii{pure module distribution}
|
|
+ {\filevar{home}\filenq{/lib/python}}
|
|
+ {\longprogramopt{install-purelib}}
|
|
+ \lineiii{non-pure module distribution}
|
|
+ {\filevar{home}\filenq{/lib/python}}
|
|
+ {\longprogramopt{install-platlib}}
|
|
+ \lineiii{scripts}
|
|
+ {\filevar{home}\filenq{/bin}}
|
|
+ {\longprogramopt{install-scripts}}
|
|
+ \lineiii{data}
|
|
+ {\filevar{home}\filenq{/share}}
|
|
+ {\longprogramopt{install-data}}
|
|
+\end{tableiii}
|
|
|
|
|
|
\versionchanged[The \longprogramopt{home} option used to be supported
|
|
@@ -452,10 +439,23 @@
|
|
etc.) If \longprogramopt{exec-prefix} is not supplied, it defaults to
|
|
\longprogramopt{prefix}. Files are installed as follows:
|
|
|
|
-\installscheme{prefix}{/lib/python2.\filevar{X}/site-packages}
|
|
- {exec-prefix}{/lib/python2.\filevar{X}/site-packages}
|
|
- {prefix}{/bin}
|
|
- {prefix}{/share}
|
|
+\begin{tableiii}{l|l|l}{textrm}
|
|
+ {Type of file}
|
|
+ {Installation Directory}
|
|
+ {Override option}
|
|
+ \lineiii{pure module distribution}
|
|
+ {\filevar{prefix}\filenq{/lib/python2.\filevar{X}/site-packages}}
|
|
+ {\longprogramopt{install-purelib}}
|
|
+ \lineiii{non-pure module distribution}
|
|
+ {\filevar{exec-prefix}\filenq{/lib/python2.\filevar{X}/site-packages}}
|
|
+ {\longprogramopt{install-platlib}}
|
|
+ \lineiii{scripts}
|
|
+ {\filevar{prefix}\filenq{/bin}}
|
|
+ {\longprogramopt{install-scripts}}
|
|
+ \lineiii{data}
|
|
+ {\filevar{prefix}\filenq{/share}}
|
|
+ {\longprogramopt{install-data}}
|
|
+\end{tableiii}
|
|
|
|
There is no requirement that \longprogramopt{prefix} or
|
|
\longprogramopt{exec-prefix} actually point to an alternate Python
|
|
@@ -502,11 +502,24 @@
|
|
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}{}
|
|
- {prefix}{\textbackslash{}Scripts}
|
|
- {prefix}{\textbackslash{}Data}
|
|
|
|
+\begin{tableiii}{l|l|l}{textrm}
|
|
+ {Type of file}
|
|
+ {Installation Directory}
|
|
+ {Override option}
|
|
+ \lineiii{pure module distribution}
|
|
+ {\filevar{prefix}\filenq{}}
|
|
+ {\longprogramopt{install-purelib}}
|
|
+ \lineiii{non-pure module distribution}
|
|
+ {\filevar{prefix}\filenq{}}
|
|
+ {\longprogramopt{install-platlib}}
|
|
+ \lineiii{scripts}
|
|
+ {\filevar{prefix}\filenq{\textbackslash{}Scripts}}
|
|
+ {\longprogramopt{install-scripts}}
|
|
+ \lineiii{data}
|
|
+ {\filevar{prefix}\filenq{\textbackslash{}Data}}
|
|
+ {\longprogramopt{install-data}}
|
|
+\end{tableiii}
|
|
|
|
|
|
\section{Custom Installation}
|