removed gzip command explanation

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

6 files changed, 11 insertions, 25 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4ccb81523..c27fe45f9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -27,6 +27,14 @@
 
 </para></listitem>
 
+<listitem><para>May 26th, 2002 [gerard]: Chapter 05 - Gawk &amp; Findutils:
+simplified the installation by removing the libexecdir modifications. We
+can live with a
+<filename class="directory">$LFS/static/libexecdir</filename> being created.
+The whole <filename class="directory">$LFS/static</filename> directory is
+temporarily anyways, so we're not all that concerned with what it looks
+like.</para></listitem>
+
 <listitem><para>May 26th, 2002 [gerard]: Chapter 06 - Creating Directories:
 removed the <userinput>cd /</userinput> command and changed the two
 <userinput>chmod</userinput> commands to use absolute paths
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index 15a48c0a7..ada4e7e72 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -9,7 +9,7 @@ commands.</para>
 
 <para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;
 ./configure --prefix=$LFS/static &amp;&amp;
-make libexecdir=$LFS/static/bin LDFLAGS=-static &amp;&amp;
-make libexecdir=$LFS/static/bin install</userinput></screen></para>
+make LDFLAGS=-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index 7b0862fd5..ff3dedb8f 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -13,11 +13,7 @@ class="directory">/usr/bin</filename> it'll run <userinput>rm -rf
 
 <para>Install Gawk by running the following commands:</para>
 
-<para><screen><userinput>cp awklib/Makefile.in awklib/Makefile.in.backup &amp;&amp;
-sed -e '/^datadir/s/awk/gawk/' \
--e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
-&nbsp;&nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
-CPPFLAGS=-Dre_max_failures=re_max_failures2 \
+<para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
 ./configure --prefix=$LFS/static --disable-nls \
 &nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/static/bin &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
diff --git a/chapter05/gzip-exp.xml b/chapter05/gzip-exp.xml
deleted file mode 100644
index 8ab485d00..000000000
--- a/chapter05/gzip-exp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin
-&amp;&amp; rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip:</userinput> The reason
-we don't simply use <quote>mv</quote> to move the files to the new location
-is because gunzip is a hardlink to gzip. On older distributions you can't
-move a hardlink to another partition (and it's very possible that $LFS and
-$LFS/usr are separate partitions). With more recent distributions this
-isn't a problem. If you run mv to move hardlinks across partitions it'll
-just do a regular <quote>cp</quote> and discard the hardlink. But, we
-can't assume that every host distribution has a new enough kernel and
-fileutils that works this way.</para>
-
-</sect2>
-
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 0155e02e1..9ae7efa96 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -6,7 +6,6 @@
 Estimated required disk space:  &gzip-compsize-static;</screen>
 
 &c5-gzip-inst;
-&c5-gzip-exp;
 &aa-gzip-desc;
 &aa-gzip-dep;
 
diff --git a/entities/gzip.ent b/entities/gzip.ent
index 5855087ce..d16863380 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -2,7 +2,6 @@
 
 <!ENTITY c5-gzip SYSTEM "../chapter05/gzip.xml">
 <!ENTITY c5-gzip-inst SYSTEM "../chapter05/gzip-inst.xml">
-<!ENTITY c5-gzip-exp SYSTEM "../chapter05/gzip-exp.xml">
 
 <!ENTITY c6-gzip SYSTEM "../chapter06/gzip.xml">
 <!ENTITY c6-gzip-inst SYSTEM "../chapter06/gzip-inst.xml">