From 0d95ff98b6a6106de1824122c69b83a43fe3966c Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Wed, 21 May 2003 19:20:35 +0000
Subject: Simplified chapter 05/bzip2+gzip commands

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2626 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml  |  6 ++++++
 chapter05/bzip2-inst.xml | 12 ++----------
 chapter05/gzip-inst.xml  |  5 +----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 79848ebd2..055cd6452 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -78,6 +78,12 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>May 21st, 2003 [gerard]: Chapter 05 - Gzip: Simplified
+commands.</para></listitem>
+
+<listitem><para>May 21st, 2003 [gerard]: Chapter 05 - Bzip2: Simplified
+commands.</para></listitem>
+
 <listitem><para>May 21st, 2003 [gerard]: Chapter 06 - Shadow: Added the
 <userinput>grpconv</userinput> command to complement the enabling of all
 shadowed passwords.</para></listitem>
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
index a64e259ad..de0ee1c43 100644
--- a/chapter05/bzip2-inst.xml
+++ b/chapter05/bzip2-inst.xml
@@ -8,16 +8,8 @@ for compilation. Instead we just run the <userinput>make</userinput>
 program and start compiling, with a few variables changed to suit our
 environment:</para>
 
-<para><screen><userinput>make -f Makefile-libbz2_so
-make clean
-make
-make PREFIX=/stage1 install
-yes | cp bzip2-shared /stage1/bin/bzip2
-ln -s libbz2.so.1.0 libbz2.so
-cp -a libbz2.so* /stage1/lib
-rm -f /stage1/bin/{bunzip2,bzcat}
-ln -s bzip2 /stage1/bin/bunzip2
-ln -s bzip2 /stage1/bin/bzcat</userinput></screen></para>
+<para><screen><userinput>make
+make PREFIX=/stage1 install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
index 20a335dd4..bd81361f5 100644
--- a/chapter05/gzip-inst.xml
+++ b/chapter05/gzip-inst.xml
@@ -5,10 +5,7 @@
 
 <para><screen><userinput>./configure --prefix=/stage1
 make
-make install
-rm -f /stage1/bin/{gunzip,zcat}
-ln -s gzip /stage1/bin/gunzip
-ln -s gzip /stage1/bin/zcat</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
 
-- 
cgit v1.2.3-54-g00ecf