[Bug 162]: Move patch commands for gzip and sh-utils in ch5 out of main text

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

8 files changed, 30 insertions, 35 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 73e44eb4d..ca895d1d3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -5,6 +5,12 @@
 
 <itemizedlist>
 
+<listitem><para>September 5th, 2001 [markh]: Chapter 5 - Gzip and
+Sh-utils: Moved the patches out of the main install instructions to a
+seperate section as we already do with the tar patch.  Also removed
+gzip-exp.xml and shellutils-exp.xml as the explanations are now part of
+the installation text.</para></listitem>
+
 <listitem><para>September 5th, 2001 [gerard]: Chapter 5 - Bash: Added
 notes that the ncurses-dev package must be installed and the libcurses.a
 symlink created if missing. Added --with-curses back to Bash's
diff --git a/chapter05/gzip-exp.xml b/chapter05/gzip-exp.xml
deleted file mode 100644
index 5c3ab225a..000000000
--- a/chapter05/gzip-exp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch </userinput> This 
-patch file is necessary to avoid a conflict of variable names with
-Glibc-2.0 systems when compiling and linking statically.</para>
-
-</sect2>
-
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
index 8d19c3cbb..09e431d2d 100644
--- a/chapter05/gzip-inst.xml
+++ b/chapter05/gzip-inst.xml
@@ -1,11 +1,19 @@
 <sect2>
 <title>Installation of Gzip</title>
 
-<para>Before Gzip is installed, the gzip patch file needs to be
-unpacked.</para>
+<para>Before Gzip is installed, the patch file may need to be applied.  This 
+patch file is necessary to avoid a conflict of variable names
+with Glibc-2.0 systems when compiling and linking statically and so is
+only required if your base system runs Glibc-2.0.  It is however
+safe to apply the patch even if you are running a different glibc
+version, so if you aren't sure, it's best to apply it.</para>
 
-<para><screen><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch &amp;&amp;</userinput>
-<userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
+<para>Apply the patch by running the following command:</para>
+
+<para><userinput>patch -Np1 -i ../gzip-&gzip-version;.patch</userinput></para>
+
+<para>Install Gzip by running the following commands:</para>
+<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;</userinput>
 <userinput>make LDFLAGS=-static &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin &amp;&amp;</userinput>
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 230b5e698..ef05b08c7 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -5,7 +5,6 @@
 Estimated required disk space:  &gzip-compsize-static;</screen>
 
 &c5-gzip-inst;
-&c5-gzip-exp;
 &aa-gzip-desc;
 &ab-gzip-dep;
 
diff --git a/chapter05/shellutils-exp.xml b/chapter05/shellutils-exp.xml
deleted file mode 100644
index 517a12acd..000000000
--- a/chapter05/shellutils-exp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>patch -Np1 -i 
-../sh-utils-&sh-utils-version;.patch</userinput>This
-patch is needed to avoid a conflict of variable names with certain Glibc
-verions (depending on the way your distributio has patched Glibc) when 
-compiling sh-utils statically.</para>
-
-</sect2>
-
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index 5f83c1a80..cce9c707b 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -1,19 +1,24 @@
 <sect2>
 <title>Installation of Sh-utils</title>
 
-<para>Before Sh-utils is installed, the sh-utils patch file needs 
-to be unpacked.</para>
+<para>Before Sh-utils is installed, the sh-utils patch file may need to
+be applied.  This patch is needed to avoid a conflict of variable names
+with certain Glibc verions (usually glibc-2.1.x) when compiling sh-utils 
+statically.  It is however safe to apply the patch even if you are
+running a different glibc version, so if you aren't sure, it's
+best to apply it.</para>
 
-<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch &amp;&amp;</userinput>
-<userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
+<para>Apply the patch by running the following command:</para>
+
+<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch</userinput></screen></para>
+
+<para>Install Sh-utils by running the following commands:</para>
+<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;</userinput>
 <userinput>make LDFLAGS=-static &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
 <userinput>cd $LFS/usr/bin &amp;&amp;</userinput>
 <userinput>mv date echo false pwd stty $LFS/bin &amp;&amp;</userinput>
 <userinput>mv su true uname hostname $LFS/bin</userinput></screen></para>
 
-<para>The patch file only needs to be applied if you are running
-glibc-2.1.x on your base system.</para>
-
 </sect2>
 
diff --git a/chapter05/shellutils.xml b/chapter05/shellutils.xml
index df2cf3500..b9c9beb9a 100644
--- a/chapter05/shellutils.xml
+++ b/chapter05/shellutils.xml
@@ -5,7 +5,6 @@
 Estimated required disk space:  &sh-utils-compsize-static;</screen>
 
 &c5-shellutils-inst;
-&c5-shellutils-exp;
 &aa-shellutils-desc;
 &ab-sh-utils-dep;
 
diff --git a/index.xml b/index.xml
index b266d9945..8b4a55049 100644
--- a/index.xml
+++ b/index.xml
@@ -156,7 +156,6 @@
 <!ENTITY c5-grep SYSTEM "chapter5/grep.xml">
 <!ENTITY c5-grep-inst SYSTEM "chapter5/grep-inst.xml">
 <!ENTITY c5-gzip SYSTEM "chapter5/gzip.xml">
-<!ENTITY c5-gzip-exp SYSTEM "chapter5/gzip-exp.xml">
 <!ENTITY c5-gzip-inst SYSTEM "chapter5/gzip-inst.xml">
 <!ENTITY c5-kernel SYSTEM "chapter5/kernel.xml">
 <!ENTITY c5-kernel-inst SYSTEM "chapter5/kernel-inst.xml">
@@ -171,7 +170,6 @@
 <!ENTITY c5-sed SYSTEM "chapter5/sed.xml">
 <!ENTITY c5-sed-inst SYSTEM "chapter5/sed-inst.xml">
 <!ENTITY c5-shellutils SYSTEM "chapter5/shellutils.xml">
-<!ENTITY c5-shellutils-exp SYSTEM "chapter5/shellutils-exp.xml">
 <!ENTITY c5-shellutils-inst SYSTEM "chapter5/shellutils-inst.xml">
 <!ENTITY c5-tar SYSTEM "chapter5/tar.xml">
 <!ENTITY c5-tar-inst SYSTEM "chapter5/tar-inst.xml">