Changeset ec10720 for pst/typesetting

Timestamp:

09/06/2014 09:23:28 PM (10 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f2831a1

Parents:

9e7816b

Message:

Slightly improve user-automation of install-tl-unx: generate the correct ARCH-linux directory name for extrapaths.sh. The directory name in the cd is unfortunately still '<CCYYMMDD>'. Also correct the biber tag to checked for 7.5.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14208 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

pst/typesetting

Files:

• biber.xml (modified) (1 diff)
• texlive.xml (modified) (1 diff)
• tl-installer.xml (modified) (2 diffs)

pst/typesetting/biber.xml

@@ -36 +36 @@
     directory at sourceforge, the 1.9 version is broken as-shipped.</para>
 
-    &lfs75_built;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

pst/typesetting/texlive.xml

@@ -11 +11 @@
 
   <!-- buildsize is the source dir, plus the kpathsea files installed to /usr.
-   The progs in bin/ARCH/ seem slightly smaller (shared libs) -->
+   The progs in bin/$TEXARCH/ seem slightly smaller (shared libs) -->
   <!ENTITY texlive-buildsize            "555 MB">
   <!ENTITY texlive-time                 "8.4 SBU">

pst/typesetting/tl-installer.xml

@@ -41 +41 @@
     <para>It is necessary to use a binary installer for the first install.
     This will provide the programs, the scripts, and a lot of supporting files
-    and documentation.  After that, you can rebuild most of the programs from source
-    by following the instructions for <xref linkend="texlive"/>.  The installer
+    and documentation.  After that, you can rebuild the programs from source
+    by following the instructions for <xref linkend="texlive"/> and
+    <xref linkend="biber"/>.  The installer
     is updated frequently, so its md5sum will change if it is newer than what
     is shown below.  Newer versions of the installer are expected to work with
@@ -146 +147 @@
     the needed paths by appending to the
     <filename>extrapaths.sh</filename> script. The programs are always
-    installed in an &lt;ARCH&gt;-linux subdirectory.
-    <emphasis>Always</emphasis> replace &lt;ARCH&gt; by x86_64, for 64bit,
-    or by i386, for 32bit, respectively, depending on the architecture that
-    you are using in your actual installation location.</para>
-
-<screen><userinput role="root">cat &gt;&gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
+    installed in an &lt;ARCH&gt;-linux subdirectory and on 32-bit x86 this is
+    always i386-linux. For x86_64 and i?86 we can generate this as $TEXARCH:
+    </para>
+
+<!-- EOF should NOT be in double quotes, we want it to evaluate $TEXARCH -->
+<screen><userinput role="root">export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
+cat &gt;&gt; /etc/profile.d/extrapaths.sh &lt;&lt; EOF
 pathappend /usr/share/man                        MANPATH
 pathappend /opt/texlive/&texlive-year;/texmf-dist/doc/man  MANPATH
 pathappend /usr/share/info                       INFOPATH
 pathappend /opt/texlive/&texlive-year;/texmf-dist/doc/info INFOPATH
-pathappend /opt/texlive/&texlive-year;/bin/&lt;ARCH&gt;-linux
-EOF</userinput></screen>
+pathappend /opt/texlive/&texlive-year;/bin/$TEXARCH
+EOF
+unset TEXARCH</userinput></screen>
 
     <note><para>The standard MANPATH and INFOPATH path are specified above to