From d943aa707999c68410d3f15c0eaea8b7ec880690 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Thu, 20 Feb 2014 17:50:58 +0000
Subject: [PATCH] TeX Live cleanups

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12748 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 pst/typesetting/texlive.xml | 74 +++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/pst/typesetting/texlive.xml b/pst/typesetting/texlive.xml
index 8d71386653..915489648e 100644
--- a/pst/typesetting/texlive.xml
+++ b/pst/typesetting/texlive.xml
@@ -34,7 +34,7 @@
     is installed at <xref linkend="tl-installer"/>. Here, we use that to rebuild
     the compiled programs from source.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -139,9 +139,8 @@
     what was originally installed.</para>
 
     <para>At the moment, these instructions do not rebuild
-    <application>xindy</application> which was installed by the binary installer.
-    If you wish to rebuild that, please consult
-    <ulink url="&blfs-ticket-root;4647">#4647</ulink>. Asy and the rest of
+    <application>xindy</application> which was installed by the binary installer,
+    due to a problem with the tarball's install procedure.  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>
@@ -151,40 +150,43 @@
 mkdir texlive-build &amp;&amp;
 cd texlive-build    &amp;&amp;
 
-../configure --prefix=/opt/texlive/2013 \
-             --bindir=/opt/texlive/2013/bin/x86_64-linux \
-             --datarootdir=/opt/texlive/2013 \
-             --includedir=/usr/include \
-             --infodir=/opt/texlive/2013/texmf-dist/doc/info \
-             --libdir=/usr/lib \
-             --mandir=/opt/texlive/2013/texmf-dist/doc/man \
-             --disable-native-texlive-build \
-             --disable-static --enable-shared \
-             --with-system-libgs \
-             --with-system-poppler \
-             --with-system-freetype2 \
-             --with-system-fontconfig \
-             --with-system-libpng \
-             --with-system-icu \
-             --with-system-graphite2 \
-             --with-system-harfbuzz \
-             --with-system-xpdf \
-             --with-system-poppler \
-             --with-system-cairo \
-             --with-system-pixman \
-             --with-system-zlib \
-             --with-banner-add=" - BLFS" &amp;&amp;
+../configure                                        \
+    --prefix=/opt/texlive/2013                      \
+    --bindir=/opt/texlive/2013/bin/x86_64-linux     \
+    --datarootdir=/opt/texlive/2013                 \
+    --includedir=/usr/include                       \
+    --infodir=/opt/texlive/2013/texmf-dist/doc/info \
+    --libdir=/usr/lib                               \
+    --mandir=/opt/texlive/2013/texmf-dist/doc/man   \
+    --disable-native-texlive-build                  \
+    --disable-static --enable-shared                \
+    --with-system-libgs                             \
+    --with-system-poppler                           \
+    --with-system-freetype2                         \
+    --with-system-fontconfig                        \
+    --with-system-libpng                            \
+    --with-system-icu                               \
+    --with-system-graphite2                         \
+    --with-system-harfbuzz                          \
+    --with-system-xpdf                              \
+    --with-system-poppler                           \
+    --with-system-cairo                             \
+    --with-system-pixman                            \
+    --with-system-zlib                              \
+    --with-banner-add=" - BLFS" &amp;&amp;
 
 pushd ../utils/asymptote &amp;&amp;
-echo "ac_cv_lib_m_sqrt=yes" >config.cache &amp;&amp;
-echo "ac_cv_lib_z_deflate=yes" >>config.cache &amp;&amp;
-./configure LIBS="-ltirpc "  --prefix=/opt/texlive/2013/ \
- --bindir=/opt/texlive/2013/bin/x86_64-linux \
- --enable-texlive-build \
- --datarootdir=/opt/texlive/2013/texmf-dist \
- --infodir=/opt/texlive/2013/texmf-dist/doc/info/ \
- --mandir=/opt/texlive/2013/texmf-dist/doc/man \
- --cache-file=config.cache &amp;&amp;
+    echo "ac_cv_lib_m_sqrt=yes"     >config.cache &amp;&amp;
+    echo "ac_cv_lib_z_deflate=yes" >>config.cache &amp;&amp;
+
+./configure LIBS="-ltirpc "                         \
+    --prefix=/opt/texlive/2013/                     \
+    --bindir=/opt/texlive/2013/bin/x86_64-linux     \
+    --enable-texlive-build                          \
+    --datarootdir=/opt/texlive/2013/texmf-dist      \
+    --infodir=/opt/texlive/2013/texmf-dist/doc/info \
+    --mandir=/opt/texlive/2013/texmf-dist/doc/man   \
+    --cache-file=config.cache &amp;&amp;
 popd &amp;&amp;
 
 make &amp;&amp;