From 0397b61e3f04dfdb45df4d2b25bc532320f9e7a0 Mon Sep 17 00:00:00 2001
From: Timothy Bauscher <timothy@linuxfromscratch.org>
Date: Fri, 17 Jan 2003 05:09:20 +0000
Subject: Billy's gzip conversion.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2385 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/gzip-exp.xml  |  8 --------
 chapter06/gzip-inst.xml | 39 ++++++++++++++++++++++++++++++++++-----
 chapter06/gzip.xml      |  5 ++---
 entities/gzip.ent       |  1 -
 4 files changed, 36 insertions(+), 17 deletions(-)
 delete mode 100644 chapter06/gzip-exp.xml

diff --git a/chapter06/gzip-exp.xml b/chapter06/gzip-exp.xml
deleted file mode 100644
index 503f642e0..000000000
--- a/chapter06/gzip-exp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>patch -Np1 -i ../gzip-1.2.4b.patch:</userinput>
-This patch fixes a buffer overflow that occurs when a filename is
-longer than 1020 characters.</para>
-
-</sect2>
diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml
index 51aaf8748..06b9441f9 100644
--- a/chapter06/gzip-inst.xml
+++ b/chapter06/gzip-inst.xml
@@ -1,14 +1,28 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Gzip</title>
 
-<para>Install Gzip by running the following commands:</para>
+<para>Prepare Gzip to be compiled:</para>
 
-<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-patch-version;.patch &amp;&amp;
+<para><screen><userinput>
+patch -Np1 -i ../gzip-&gzip-patch-version;.patch &amp;&amp; 
 ./configure --prefix=/usr &amp;&amp;
 cp gzexe.in{,.backup} &amp;&amp;
-sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
+sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in
+</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
+
+<para>Move the Gzip binaries to the root partition:</para>
+
+<para><screen><userinput>
 mv /usr/bin/gzip /bin &amp;&amp;
 rm /usr/bin/{gunzip,zcat} &amp;&amp;
 ln -s gzip /bin/gunzip &amp;&amp;
@@ -17,3 +31,18 @@ ln -s gunzip /bin/uncompress</userinput></screen></para>
 
 </sect2>
 
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i ../gzip-1.2.4b.patch:</userinput>
+This patch fixes a buffer overflow that occurs when a filename is
+longer than 1020 characters.</para>
+
+<para><userinput>
+cp gzexe.in{,.backup} &amp;&amp;
+sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in</userinput>
+Change the default installation directory for Gzip so it will be
+installed on the root partition.</para>
+
+
+</sect2>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 0cf15fa30..616614f1f 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -5,9 +5,8 @@
 <screen>Estimated build time:           &gzip-time;
 Estimated required disk space:  &gzip-compsize;</screen>
 
-&c6-gzip-inst;
-&c6-gzip-exp;
-&aa-gzip-desc;
+&aa-gzip-shortdesc;
 &aa-gzip-dep;
+&c6-gzip-inst;
 
 </sect1>
diff --git a/entities/gzip.ent b/entities/gzip.ent
index 44e5e4b2d..d05fe50b9 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -6,7 +6,6 @@
 
 <!ENTITY c6-gzip SYSTEM "../chapter06/gzip.xml">
 <!ENTITY c6-gzip-inst SYSTEM "../chapter06/gzip-inst.xml">
-<!ENTITY c6-gzip-exp SYSTEM "../chapter06/gzip-exp.xml">
 
 <!ENTITY aa-gzip SYSTEM "../appendixa/gzip.xml">
 <!ENTITY aa-gzip-shortdesc SYSTEM "../appendixa/gzip-shortdesc.xml">
-- 
cgit v1.2.3-54-g00ecf