From 509125143a054af2785ac0d66e1a457981962040 Mon Sep 17 00:00:00 2001
From: Jim Gifford <jim@linuxfromscratch.org>
Date: Fri, 3 Dec 2004 18:29:38 +0000
Subject: Updates: zlib, readline Upgrade: perl to 5.8.6

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4344 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/readline.xml | 14 ++++----------
 chapter06/zlib.xml     | 22 +---------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 5ce6413ba..64feb87a0 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -35,7 +35,7 @@ sometimes will only show 33 characters on a line and then wrap to the next line.
 
 <para>Prepare Readline for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -47,17 +47,11 @@ sometimes will only show 33 characters on a line and then wrap to the next line.
 
 <para>Give Readline's dynamic libraries to a more appropriate permissions:</para>
 
-<screen><userinput>chmod 755 /usr/lib/*.&readline-version;</userinput></screen>
+<screen><userinput>chmod 755 /lib/lib{readline.history}.so*</userinput></screen>
 
-<para>And move them to a more appropriate location:</para>
+<para>Now we move them static libraries to a more appropriate location:</para>
 
-<screen><userinput>mv /usr/lib/lib{readline,history}.so.5* /lib</userinput></screen>
-
-<para>Because the libraries have been moved, a few symlinks are now pointing to
-non-existent files. Recreate those symlinks:</para>
-
-<screen><userinput>ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so
-ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so</userinput></screen>
+<screen><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
 
 </sect2>
 
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 8aa195b62..f32d235e8 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -36,7 +36,7 @@ afterwards.</para></note>
 
 <para>Prepare Zlib for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --shared</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -66,26 +66,6 @@ make</userinput></screen>
 
 <screen><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
 
-<para>It is good policy and common practice to place important libraries into
-the <filename class="directory">/lib</filename> directory. This matters most
-in scenarios where <filename class="directory">/usr</filename> is on a
-separate partition. Essentially, the run-time components of any libraries that
-are used by programs in <filename class="directory">/bin</filename> or
-<filename class="directory">/sbin</filename> should reside in
-<filename class="directory">/lib</filename> so that they are on the root
-partition and available in the event of
-<filename class="directory">/usr</filename> being inaccessible.</para>
-
-<para>For the above reason we move the run-time components of the shared Zlib
-into <filename class="directory">/lib</filename>:</para>
-
-<screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen>
-
-<para>Now we need to fix the <filename class="symlink">/usr/lib/libz.so</filename> symlink
-because we just moved the file it points to:</para>
-
-<screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
-
 </sect2>
 
 
-- 
cgit v1.2.3-54-g00ecf