Index: chapter06/file-exp.xml
===================================================================
--- chapter06/file-exp.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>touch aclocal.m4 configure Makefile.in stamp-h.in</userinput>:
-This command works around an error which occurs when compiling file with
-automake-1.5 installed by changing the modification dates of some files to
-the current date. Changing the date will cause make to think the files are
-already up-to-date so they're not recreated.</para>
-
-</sect2>
-
Index: chapter06/file-inst.xml
===================================================================
--- chapter06/file-inst.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/file-inst.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -4,6 +4,5 @@
 <para>Install File by running the following commands:</para>
 
-<para><screen><userinput>touch aclocal.m4 configure Makefile.in stamp-h.in &amp;&amp;
-./configure --prefix=/usr --datadir=/usr/share/misc &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr --datadir=/usr/share/misc &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: chapter06/file.xml
===================================================================
--- chapter06/file.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/file.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -7,5 +7,4 @@
 
 &c6-file-inst;
-&c6-file-exp;
 &aa-file-desc;
 &aa-file-dep;
Index: chapter06/findutils-inst.xml
===================================================================
--- chapter06/findutils-inst.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/findutils-inst.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -8,5 +8,5 @@
 <para>Install Findutils by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../findutils-4.1.patch &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../findutils-&findutils-version;.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make libexecdir=/usr/bin &amp;&amp;
Index: chapter06/gcc-inst.xml
===================================================================
--- chapter06/gcc-inst.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/gcc-inst.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -23,16 +23,14 @@
 who actively work on LFS.</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
-mkdir ../gcc-build &amp;&amp;
+<para><screen><userinput>mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --enable-threads=posix &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++ --enable-threads=posix \
+&nbsp;&nbsp;&nbsp;&nbsp;--with-slibdir=/lib &amp;&amp;
 make bootstrap &amp;&amp;
 make install &amp;&amp;
 ln -sf ../usr/bin/cpp /lib &amp;&amp;
 ln -sf ../bin/cpp /usr/lib &amp;&amp;
-ln -sf gcc /usr/bin/cc &amp;&amp;
-rmdir /usr/*-gnu/include &amp;&amp;
-rmdir /usr/*-gnu</userinput></screen></para>
+ln -sf gcc /usr/bin/cc</userinput></screen></para>
 
 </sect2>
Index: chapter06/ncurses-exp.xml
===================================================================
--- chapter06/ncurses-exp.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/ncurses-exp.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -1,4 +1,9 @@
 <sect2>
 <title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i
+../ncurses-&ncurses-version;-patch:</userinput> This patch fixes a compile
+problem with GCC-3.1 because Ncurses uses constructions that are no longer
+valid in the new C++ standard.</para>
 
 <para><userinput>--with-shared:</userinput> This enables the build of the
Index: chapter06/ncurses-inst.xml
===================================================================
--- chapter06/ncurses-inst.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/ncurses-inst.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -4,5 +4,6 @@
 <para>Install Ncurses by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libdir=/lib \
+<para><screen><userinput>patch -Np1 -i ../ncurses-&ncurses-version;-patch &amp;&amp;
+./configure --prefix=/usr --libdir=/lib \
 &nbsp;&nbsp;&nbsp;&nbsp;--with-shared --disable-termcap &amp;&amp;
 make &amp;&amp;
Index: chapter06/perl-exp.xml
===================================================================
--- chapter06/perl-exp.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
+++ chapter06/perl-exp.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i ../perl-&perl-version;.patch:</userinput> This
+patch fixes a compile problem with GCC-3.1.</para>
+
+</sect2>
+
Index: chapter06/perl-inst.xml
===================================================================
--- chapter06/perl-inst.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/perl-inst.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -4,5 +4,6 @@
 <para>Install Perl by running the following commands:</para>
 
-<para><screen><userinput>./configure.gnu --prefix=/usr &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../perl-&perl-version;.patch &amp;&amp;
+./configure.gnu --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: chapter06/perl.xml
===================================================================
--- chapter06/perl.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/perl.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -7,4 +7,5 @@
 
 &c6-perl-inst;
+&c6-perl-exp;
 &aa-perl-desc;
 &aa-perl-dep;
Index: chapter06/vim-exp.xml
===================================================================
--- chapter06/vim-exp.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/vim-exp.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -1,4 +1,7 @@
 <sect2>
 <title>Command explanations</title>
+
+<para><userinput>patch -Np1 -i ../vim-&vim-version;.patch:</userinput> This
+patch fixes a compile problem with GCC-3.1.</para>
 
 <para><userinput>make
Index: chapter06/vim-inst.xml
===================================================================
--- chapter06/vim-inst.xml	(revision 69b8ba44aae8e53d8a7cadf5d87974d6e796b221)
+++ chapter06/vim-inst.xml	(revision f6810d47a98a74bc11a1787843e10a32ab7eea27)
@@ -10,5 +10,6 @@
 <para>Install Vim by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../vim-&vim-version;.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
