Synced missing parts from zlib and readline

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/testing/BOOK@4644 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 17 insertions, 28 deletions

diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index c9d1ed403..2760dee11 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -59,18 +59,22 @@ Readline author.</para>
 
 <para>Give Readline's dynamic libraries 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>
 
 <beginpage/>
-<para>Move the dynamic libraries to a more appropriate location:</para>
 
-<screen><userinput>mv /usr/lib/lib{readline,history}.so.5* /lib</userinput></screen>
+<para>Now we move the static libraries to a more appropriate
+location:</para>
 
-<para>Because the libraries have been moved, a few symlinks are now pointing to
-non-existent files. Recreate those symlinks:</para>
+<screen><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
 
-<screen><userinput>ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so
-ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so</userinput></screen>
+<para>Next we will remove the old, <filename>.so</filename> files in
+<filename class="directory">/lib</filename> and relink them into
+<filename class="directory">/usr/lib</filename>.</para>
+
+<screen><userinput>rm /lib/lib{readline,history}.so
+ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
+ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
 
 </sect2>
 
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 74ade619e..c95e95b1f 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -50,6 +50,12 @@ configure command below, then remove it afterwards.</para></note>
 
 <screen><userinput>make install</userinput></screen>
 
+<para>Now we will remove the old, .so files in /lib and relink them
+into /usr/lib.</para>
+
+<screen><userinput>rm /lib/libz.so
+ln -sf ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
+
 <beginpage/>
 
 <para>Build the static library:</para>
@@ -69,27 +75,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 is most important 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, 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>Fix the <filename class="symlink">/usr/lib/libz.so</filename>
-symlink:</para>
-
-<screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
-
 </sect2>