removed zlib from chapter 5

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

5 files changed, 6 insertions, 42 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 59613878e..6dc4c1293 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -66,6 +66,12 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 5th, 2003 [gerard]: Removed zlib installation from
+chapter 5 (its inclusion was a mistake).</para></listitem>
+
+<listitem><para>May 5th, 2003 [gerard]: Various buf fixes that were
+introduced during the pure-lfs integration.</para></listitem>
+
 <listitem><para>May 2nd, 2003 [gerard]: Upgraded to: automake-1.7.4,
 e2fsprogs-1.33, file-4.02, flex-2.5.31, gawk-3.1.2, gcc-3.2.3, glibc-2.3.2,
 grep-2.5.1, groff-1.19, less-381, libtool-1.5, man-1.5l, man-pages-1.56,
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index c1b96b81c..a8369c913 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -17,7 +17,6 @@
 &c5-dejagnu;
 &c5-gcc-pass2;
 &c5-binutils-pass2;
-&c5-zlib;
 &c5-gawk;
 &c5-coreutils;
 &c5-bzip2;
diff --git a/chapter05/zlib-inst.xml b/chapter05/zlib-inst.xml
deleted file mode 100644
index d49bab377..000000000
--- a/chapter05/zlib-inst.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Zlib</title>
-
-<para>Prepare Zlib to be compiled:</para>
-
-<para><screen><userinput>CFLAGS="-O2 -pipe" \
-&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=/stage1 --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
-make test</userinput></screen></para>
-
-<para>Install the libraries:</para>
-
-<para><screen><userinput>make install</userinput></screen></para>
-
-</sect2>
diff --git a/chapter05/zlib.xml b/chapter05/zlib.xml
deleted file mode 100644
index 591ae69df..000000000
--- a/chapter05/zlib.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<sect1 id="ch05-zlib">
-<title>Installing Zlib-&zlib-version;</title>
-<?dbhtml filename="zlib.html" dir="chapter05"?>
-
-<screen>Estimated build time:           &zlib-time;
-Estimated required disk space:  &zlib-compsize;</screen>
-
-&aa-zlib-shortdesc;
-&aa-zlib-dep;
-&c5-zlib-inst;
-
-</sect1>
-
diff --git a/entities/zlib.ent b/entities/zlib.ent
index 86fc5e81a..74e4a9666 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -1,8 +1,5 @@
 <!ENTITY c4-zlib SYSTEM "../chapter04/zlib.xml">
 
-<!ENTITY c5-zlib SYSTEM "../chapter05/zlib.xml">
-<!ENTITY c5-zlib-inst SYSTEM "../chapter05/zlib-inst.xml">
-
 <!ENTITY c6-zlib SYSTEM "../chapter06/zlib.xml">
 <!ENTITY c6-zlib-inst SYSTEM "../chapter06/zlib-inst.xml">