Convert zlib to new layout. Conform shortdesc files.

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

2 files changed, 39 insertions, 9 deletions

diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml
index de778d548..94c901644 100644
--- a/chapter06/zlib-inst.xml
+++ b/chapter06/zlib-inst.xml
@@ -1,14 +1,44 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Zlib</title>
 
-<para>Install Zlib by running the following commands:</para>
+<para>Prepare Zlib to be compiled:</para>
 
 <para><screen><userinput>CFLAGS="$CFLAGS -fPIC" \
-./configure --prefix=/usr --shared &amp;&amp;
-make LIBS="libz.so.1.1.4 libz.a" &amp;&amp;
-make LIBS="libz.so.1.1.4 libz.a" install &amp;&amp;
-mv /usr/lib/libz.so.* /lib &amp;&amp;
-ln -sf ../../lib/libz.so.1 /usr/lib/libz.so &amp;&amp;
-cp zlib.3 /usr/share/man/man3</userinput></screen></para>
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=/usr --shared</userinput></screen></para>
+
+<para>The <emphasis>-fPIC</emphasis> flag helps to assure
+quality in the dynamic zlib library.</para>
+
+<para>Some packages expect a static zlib library to be present
+on the system. To satisfy those programs, compile both the
+shared and static libraries:</para>
+
+<para><screen><userinput>make LIBS="libz.so.1.1.4 libz.a"</userinput></screen></para>
+
+<para>Install the libraries:</para>
+
+<para><screen><userinput>make LIBS="libz.so.1.1.4 libz.a" install</userinput></screen></para>
+
+<para>The shared zlib library should be installed in the
+<filename>/lib</filename> directory. That way, in the event
+that you must boot without the <filename>/usr</filename>
+directory, vital system programs will still have access to
+the library. Finish installing shared library:</para>
+
+<para><screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen></para>
+
+<para>The <filename>/usr/lib/libz.so</filename> symlink is
+linked to a file which no longer exists, because we moved
+it. Create a symbolic link to the new location of the
+library:</para>
+
+<para><screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen></para>
+
+<para>Zlib does not install its manual page. Issue the
+following command to install this documentation:</para>
+
+<para><screen><userinput>cp zlib.3 /usr/share/man/man3</userinput></screen></para>
 
 </sect2>
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index db8233941..0a204357d 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -5,9 +5,9 @@
 <screen>Estimated build time:           &zlib-time;
 Estimated required disk space:  &zlib-compsize;</screen>
 
-&c6-zlib-inst;
-&aa-zlib-desc;
+&aa-zlib-shortdesc;
 &aa-zlib-dep;
+&c6-zlib-inst;
 
 </sect1>