Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision f9f759de15eb216448e2eee95573c5e9908aab95)
+++ pst/typesetting/texlive.xml	(revision eb38c8a5c897dbcedd6fdedfa7548354820fe9e6)
@@ -10,8 +10,6 @@
   <!ENTITY texlive-source-size          "40 MB">
 
-  <!-- buildsize is the source dir, plus the kpathsea files installed to /usr.
-   The progs in bin/$TEXARCH/ seem slightly smaller (shared libs) -->
-  <!ENTITY texlive-buildsize            "555 MB">
-  <!ENTITY texlive-time                 "8.4 SBU">
+  <!ENTITY texlive-buildsize            "923 MB (if starting from pass 1)">
+  <!ENTITY texlive-time                 "9.0 SBU">
 ]>
 
@@ -24,5 +22,5 @@
   </sect1info>
 
-  <title>texlive-&texlive-version;</title>
+  <title>texlive-&texlive-version;-source</title>
 
   <indexterm zone="texlive">
@@ -33,7 +31,8 @@
     <title>Introduction to TeX Live from source</title>
 
-    <para>A binary version of the <application>TeX Live</application> package
-    is installed at <xref linkend="tl-installer"/>. Here, we use that to rebuild
-    the compiled programs from source.</para>
+    <para>After installing a partial TeX build (or alternatively installing the
+    binary version), here we will build all of TeX Live from source (except
+    <application>biber</application> which is not supplied in the source tarball
+    and will be dealt with separately).</para>
 
     &lfs76_checked;
@@ -65,8 +64,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="tl-installer"/> or a previous version of TeX Live
-      (untested, you would need to alter the configure switches which refer
-      to &texlive-year; so that it overwrites your existing installation, or
-      else copy everything to the location for the current year), and
+      Either <xref linkend="texpass1"/> or <xref linkend="tl-installer"/>
+      , and
       <xref linkend="clisp"/> (to build <command>xindy</command> which is an
       index processor for multi-lingual index creation)
@@ -109,5 +106,5 @@
     <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
     <para role="recommended">
-      Some (re-installed) scripts will use
+      Some scripts will use
       <xref linkend="python2"/> or <xref linkend="ruby"/>.
     </para>
@@ -121,33 +118,14 @@
     <title>Installation of TeX Live</title>
 
-    <para>These instructions will overwrite the corresponding files from the
-    binary installer.  As with the installer, change x86_64-linux to whatever
-    matches your architecture.</para>
-
-    <para>Please note that installing from source will recompile the binary
-    programs and recreate the <literal>man</literal> and <literal>info</literal>
-    files.  It will also overwrite the scripts - some of these may be older
-    versions than those from the newer installer.  It will <emphasis>not</emphasis>
-    recreate any of the following: the more than 200 symlinks in the
-    x86_64-linux directory (some are alternate names, many are pointers to
-    the scripts), html files, PDF files, licenses, README files, two config
-    files (<filename>texmf.cnf</filename> and <filename>texmfcnf.lua</filename>),
-    nor the many package and font files in
-    <filename class="directory">texmf-dist</filename> and
-    <filename class="directory">texmf-var</filename>, nor the files recording
-    the actions of the installer, and the <filename>ls-R</filename> files listing
-    what was originally installed.</para>
-
-    <para>Asy and the rest of asymptote is by default not rebuilt, so we have to
-    separately run <command>configure</command> and <command>make</command> in its
-    directory.
-    </para>
-
-<screen><userinput>mkdir texlive-build &amp;&amp;
+    <para>If you started with the binary installer, these instructions will
+    overwrite the programs it installed.</para>
+
+<screen role="root"><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
+mkdir texlive-build &amp;&amp;
 cd texlive-build    &amp;&amp;
 
 ../configure                                        \
     --prefix=/opt/texlive/&texlive-year;                      \
-    --bindir=/opt/texlive/&texlive-year;/bin/x86_64-linux     \
+    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH         \
     --datarootdir=/opt/texlive/&texlive-year;                 \
     --includedir=/usr/include                       \
@@ -188,11 +166,12 @@
 ./configure LIBS="-ltirpc "                         \
     --prefix=/opt/texlive/&texlive-year;/                     \
-    --bindir=/opt/texlive/&texlive-year;/bin/x86_64-linux     \
+    --bindir=/opt/texlive/&texlive-year;/bin/$TEXARCH     \
     --enable-texlive-build                          \
     --datarootdir=/opt/texlive/&texlive-year;/texmf-dist      \
     --infodir=/opt/texlive/&texlive-year;/texmf-dist/doc/info \
     --mandir=/opt/texlive/&texlive-year;/texmf-dist/doc/man   \
-    --cache-file=config.cache &amp;&amp;
+    --cache-file=config.cache &amp;&amp; &amp;&amp;
 popd &amp;&amp;
+unset TEXARCH &amp;&amp;
 
 make &amp;&amp;
@@ -202,8 +181,17 @@
     make -C utils/asymptote check</command>.</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem>
+    <para>If you have used the binary installer, you will want to
+    do a full install. As the <systemitem class="username">root</systemitem>
     user:</para>
 
-<screen><userinput role="root">make install &amp;&amp;
+<screen><userinput role="nodump">make install &amp;&amp;
+make -C ../utils/asymptote install</userinput></screen>
+
+    <para>For people who have followed the LFS way and built from source,
+    it is only necessary to install <application>xindy</application> and
+    <application>asy</application>, so, as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen><userinput role="root">make -C utils/xindy install &amp;&amp;
 make -C ../utils/asymptote install</userinput></screen>
 
