[Bug 60] Update to man-1.5j

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

5 files changed, 10 insertions, 23 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b521a8aff..9caf8f6bb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -24,6 +24,7 @@
 <listitem><para>libtool-1.4.2</para></listitem>
 <listitem><para>lilo-22.1</para></listitem>
 <listitem><para>linux-2.4.16</para></listitem>
+<listitem><para>man-1.5j</para><listitem>
 <listitem><para>man-pages-1.43</para></listitem>
 <listitem><para>modutils-2.4.12</para></listitem>
 <listitem><para>sysvinit-2.83</para></listitem>
@@ -33,6 +34,10 @@
 
 </para></listitem>
 
+<listitem><para>November 30th, 2001 [markh]: Chapter 6: Updated to
+man-1.5j.  Removed the sed which we had to use with the old version as
+the new one detects awk properly.</para></listitem>
+
 <listitem><para>November 30th, 2001 [markh]: Chapter 5: Added static
 library explanation originally posted on lfs-apps (when it still
 existed) by Plasmatic.</para></listitem>
diff --git a/chapter06/man-exp.xml b/chapter06/man-exp.xml
deleted file mode 100644
index b7ab46db4..000000000
--- a/chapter06/man-exp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>for ... sed ... done:</userinput> This construct
-changes man so that it uses awk instead of gawk which is the default.
-We use this as LFS uses awk instead of gawk.</para>
-
-</sect2>
-
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index a2c331b93..2aee946aa 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -3,14 +3,7 @@
 
 <para>Run the following commands to install man:</para>
 
-<para><screen><userinput>for i in configure src/Makefile.in src/makewhatis.sh
-do
-&nbsp;&nbsp;&nbsp;cp $i $i.backup &amp;&amp;
-&nbsp;&nbsp;&nbsp;sed 's/gawk/awk/g' $i &gt; tmp~ &amp;&amp;
-&nbsp;&nbsp;&nbsp;mv tmp~ $i
-done &amp;&amp;
-chmod 755 configure &amp;&amp;
-./configure -default &amp;&amp;
+<para><screen><userinput>./configure -default &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter06/man.xml b/chapter06/man.xml
index fea467d0e..0e8ec97ec 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -6,7 +6,6 @@
 Estimated required disk space:  &man-compsize;</screen>
 
 &c6-man-inst;
-&c6-man-exp;
 &aa-man-desc;
 &ab-man-dep;
 
diff --git a/index.xml b/index.xml
index 77f378579..5ebf6e3c8 100644
--- a/index.xml
+++ b/index.xml
@@ -276,7 +276,6 @@
 <!ENTITY c6-shadowpwd-inst SYSTEM "chapter6/shadowpwd-inst.xml">
 <!ENTITY c6-shadowpwd-exp SYSTEM "chapter6/shadowpwd-exp.xml">
 <!ENTITY c6-man SYSTEM "chapter6/man.xml">
-<!ENTITY c6-man-exp SYSTEM "chapter6/man-exp.xml">
 <!ENTITY c6-man-inst SYSTEM "chapter6/man-inst.xml">
 <!ENTITY c6-modutils SYSTEM "chapter6/modutils.xml">
 <!ENTITY c6-modutils-inst SYSTEM "chapter6/modutils-inst.xml">
@@ -642,8 +641,8 @@
 <!ENTITY ad-netkitbase SYSTEM "appendixd/netkitbase.xml">
 <!ENTITY ad-nettools SYSTEM "appendixd/nettools.xml">
 
-<!ENTITY all-version "cvs-20011126-1450">
-<!ENTITY all-size-kb "80,530 MB">
+<!ENTITY all-version "cvs-20011130-1630">
+<!ENTITY all-size-kb "80,540 MB">
 <!ENTITY all-size-mb "78.65 MB">
 
 <!ENTITY bootscripts-version "cvs-20010907-2249">
@@ -859,9 +858,9 @@
 <!ENTITY groff-compsize "16 MB">
 <!ENTITY groff-time "2 minutes">
 
-<!ENTITY man-version "1.5i2">
+<!ENTITY man-version "1.5j">
 <!ENTITY man-depversion "1.5i2">
-<!ENTITY man-size "158 KB">
+<!ENTITY man-size "167 KB">
 <!ENTITY man-compsize "1 MB">
 <!ENTITY man-time "1 minute">