Convert zlib to new layout. Conform shortdesc files.

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

appendixa/makedev-shortdesc.xml

@@ -8,6 +8,8 @@ directory. Detailed information about device nodes may be found
 in the <filename>Documentation/devices.txt</filename> file under
 the Linux kernel source tree.</para>
 
+<para>MAKDEV installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>MAKEDEV</para></sect3>
 

appendixa/manpages-shortdesc.xml

@@ -7,6 +7,8 @@ documentation details the C and C++ functions, describes a few
 important device files and provides documents which would otherwise
 be missing from other packages.</para>
 
+<para>Man-pages installs the following:</para>
+
 <sect3><title>Support Files</title>
 <para>Various manual pages.</para></sect3>
 

appendixa/patch-shortdesc.xml

@@ -6,7 +6,7 @@
 file usually is a list, created by the diff program, that contains
 instructions on how an original file needs to be modified.</para>
 
-<para>Make installs the following:</para>
+<para>Patch installs the following:</para>
 
 <sect3><title>Program Files</title>
 <para>patch</para></sect3>

appendixa/perl-shortdesc.xml

@@ -6,6 +6,8 @@
 and Report Language. Perl combines some of the best features of C,
 sed, awk and sh into one powerful language.</para>
 
+<para>Perl installs the following:</para>
+
 <sect3><title>Program files and libraries</title>
 
 <para>a2p, c2ph, dprofpp, find2perl, h2ph, h2xs, perl, perl5.6.1,

appendixa/tar-shortdesc.xml

@@ -5,6 +5,8 @@
 <para>Tar is an archiving program designed to store and extract
 files from an archive file known as a tar file.</para>
 
+<para>Tar installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>rmt and tar</para></sect3>
 

appendixa/texinfo-shortdesc.xml

@@ -6,6 +6,8 @@
 writing and converting Info documents, which provide system
 documentation.</para>
 
+<para>Texinfo installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>info, infokey, install-info, makeinfo, texi2dvi and
 texindex</para></sect3>

appendixa/textutils-shortdesc.xml

@@ -5,6 +5,8 @@
 <para>The Textutils package contains several file manipulation
 and text processing programs.</para>
 
+<para>Textutils installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>cat, cksum, comm, csplit, cut, expand,
 fmt, fold, head, join, md5sum, nl, od, paste, pr, ptx, sort, split, sum,

appendixa/utillinux-shortdesc.xml

@@ -7,6 +7,8 @@ utility programs. Some of the more prominent utilities are used
 to mount, unmount, format, partition and manage disk drives,
 open tty ports and fetch kernel messages.</para>
 
+<para>Util-linux installs the following:</para>
+
 <sect3><title>Program Files</title>
 <para>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
 colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk,

appendixa/zlib-dep.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Zlib Installation Dependencies</title>
 

appendixa/zlib-desc.xml

@@ -1,11 +1,10 @@
-<sect2><title>Contents of Zlib</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2><title>Descriptions</title>
 
 <para>Last checked against version &zlib-contversion;.</para>
 
-<sect3><title>Library Files</title>
+<sect3><title>Program file descriptions</title>
-<para>libz[a,so]</para></sect3>
-
-<sect3><title>Descriptions</title>
 
 <sect4><title>libz</title>
 <para>This is the zlib library, which is used by many programs for its

appendixa/zlib-down.xml

@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Official Download Location</title>
 

appendixa/zlib-shortdesc.xml

@@ -0,0 +1,15 @@
+<sect2><title>Contents of Zlib</title>
+
+<para>Last checked against version &zlib-contversion;.</para>
+
+<para>The Zlib package contains the zlib library, which
+is used by many programs for its compression and uncompression
+functions.</para>
+
+<para>Zlib installs the following:</para>
+
+<sect3><title>Library Files</title>
+<para>libz[a,so]</para></sect3>
+
+</sect2>
+

appendixa/zlib.xml

@@ -3,6 +3,7 @@
 <?dbhtml filename="zlib.html" dir="appendixa"?>
 
 &aa-zlib-down;
+&aa-zlib-shortdesc;
 &aa-zlib-desc;
 &aa-zlib-dep;
 

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;
+&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=/usr --shared</userinput></screen></para>
-make LIBS="libz.so.1.1.4 libz.a" &amp;&amp;
+
-make LIBS="libz.so.1.1.4 libz.a" install &amp;&amp;
+<para>The <emphasis>-fPIC</emphasis> flag helps to assure
-mv /usr/lib/libz.so.* /lib &amp;&amp;
+quality in the dynamic zlib library.</para>
-ln -sf ../../lib/libz.so.1 /usr/lib/libz.so &amp;&amp;
+
-cp zlib.3 /usr/share/man/man3</userinput></screen></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>

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-shortdesc;
-&aa-zlib-desc;
 &aa-zlib-dep;
+&c6-zlib-inst;
 
 </sect1>
 

entities/zlib.ent

@@ -7,6 +7,7 @@
 <!ENTITY aa-zlib-desc SYSTEM "../appendixa/zlib-desc.xml">
 <!ENTITY aa-zlib-dep SYSTEM "../appendixa/zlib-dep.xml">
 <!ENTITY aa-zlib-down SYSTEM "../appendixa/zlib-down.xml">
+<!ENTITY aa-zlib-shortdesc SYSTEM "../appendixa/zlib-shortdesc.xml">
 
 <!ENTITY zlib-version "1.1.4">
 <!ENTITY zlib-depversion "1.1.4">