5 files changed, 12 insertions, 53 deletions
diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml
index 905e4eb53..c24d79ea3 100644
--- a/chapter06/bzip2-inst.xml
+++ b/chapter06/bzip2-inst.xml
@@ -3,25 +3,21 @@
 
 <para>Install Bzip2 by running the following commands:</para>
 
-<para><screen><userinput>make -f Makefile-libbz2_so &amp;&amp;
-make bzip2recover libbz2.a &amp;&amp;
-ln -s libbz2.so.1.0.1 libbz2.so &amp;&amp;
+<para><screen><userinput>make &amp;&amp;
+make -f Makefile-libbz2_so &amp;&amp;
+make PREFIX=/usr install &amp;&amp;
 cp bzip2-shared /bin/bzip2 &amp;&amp;
-cp bzip2recover /bin &amp;&amp;
-cp bzip2.1 /usr/share/man/man1 &amp;&amp;
-cp bzlib.h /usr/include &amp;&amp;
+ln -s libbz2.so.1.0 libbz2.so &amp;&amp;
 cp -a libbz2.so* /lib &amp;&amp;
-rm /usr/lib/libbz2.a &amp;&amp;
-cp libbz2.a /usr/lib &amp;&amp;
 cd /usr/lib &amp;&amp;
 ln -sf ../../lib/libbz2.so &amp;&amp;
+cd /usr/bin &amp;&amp;
+rm bunzip2 bzcat bzip2 &amp;&amp;
+mv bzip2recover bzless bzmore /bin &amp;&amp;
 cd /bin &amp;&amp;
 ln -sf bzip2 bunzip2 &amp;&amp;
-ln -sf bzip2 bzcat &amp;&amp;
-cd /usr/share/man/man1 &amp;&amp;
-ln -sf bzip2.1 bunzip2.1 &amp;&amp;
-ln -sf bzip2.1 bzcat.1 &amp;&amp;
-ln -sf bzip2.1 bzip2recover.1</userinput></screen></para>
+ln -sf bzip2 bzcat</userinput></screen></para>
+
 
 <para>Although it's not strictly a part of a basic LFS system it's worth
 mentioning that a patch for Tar can be downloaded which enables the tar
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 3c7601438..2db19f760 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -12,7 +12,7 @@
 &c6-makedev;
 &c6-manpages;
 &c6-findutils;
-&c6-mawk;
+&c6-gawk;
 &c6-ncurses;
 &c6-vim;
 &c6-gcc;
diff --git a/chapter06/mawk-inst.xml b/chapter06/mawk-inst.xml
deleted file mode 100644
index 199bd0f56..000000000
--- a/chapter06/mawk-inst.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<sect2>
-<title>Installation of Mawk</title>
-
-<para>Install Mawk by running the following commands:</para>
-
-<para><screen><userinput>./configure &amp;&amp;
-make &amp;&amp;
-make BINDIR=/usr/bin \
-&nbsp;&nbsp;&nbsp;MANDIR=/usr/share/man/man1 install &amp;&amp;
-cd /usr/bin &amp;&amp;
-ln -sf mawk awk</userinput></screen></para>
-
-</sect2>
-
diff --git a/chapter06/mawk.xml b/chapter06/mawk.xml
deleted file mode 100644
index b79830b62..000000000
--- a/chapter06/mawk.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<sect1 id="ch06-mawk">
-<title>Installing Mawk-&mawk-version;</title>
-<?dbhtml filename="mawk.html" dir="chapter06"?>
-
-<screen>Estimated build time:           &mawk-time;
-Estimated required disk space:  &mawk-compsize;</screen>
-
-&c6-mawk-inst;
-&aa-mawk-desc;
-&aa-mawk-dep;
-
-</sect1>
-
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index d89b56931..7af472138 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -9,24 +9,14 @@ passwords and how to get the most out of this Shadow package.</para>
 <para>Install the Shadow Password Suite by running the 
 following commands:</para>
 
-<para><screen><userinput>cp src/useradd.c src/useradd.c.backup &amp;&amp;
-sed 's/\(.*\) (nflg || \(.*\))\(.*\)/\1\2\3/' \
-&nbsp;&nbsp;&nbsp;src/useradd.c.backup &gt; src/useradd.c &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
 cd etc &amp;&amp;
 cp limits login.access /etc &amp;&amp;
 sed 's%/var/spool/mail%/var/mail%' login.defs.linux &gt; /etc/login.defs &amp;&amp;
-cd /lib &amp;&amp;
-mv libshadow.*a /usr/lib &amp;&amp;
-ln -sf libshadow.so.0 libshadow.so &amp;&amp;
-cd /usr/lib &amp;&amp;
-ln -sf ../../lib/libshadow.so &amp;&amp;
 cd /usr/sbin &amp;&amp;
-ln -sf vipw vigr &amp;&amp;
-cd /usr/share/man/man8 &amp;&amp;
-ln -sf vipw.8 vigr.8</userinput></screen></para>
+ln -sf vipw vigr</userinput></screen></para>
 
 </sect2>