fixed gcc nofixincludes patch

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

chapter01/changelog.xml

@@ -6,15 +6,14 @@
 
 <itemizedlist>
 
+<listitem><para>September 29th, 2002 [gerard]: Chapter 05 - GCC: Fixed the
+old nofixincludes patch and reinstated it.</para></listitem>
+
 <listitem><para>September 29th, 2002 [markh]: Chapter 05 - Bash: Correct
 reference to Debian to refer to the old stable release (potato) as it
 doesn't apply to the current one (woody).  Reported by h2k1 on
 #lfs.</para></listitem>
 
-<listitem><para>September 29th, 2002 [timothy]: Chapter 05 - GCC: Replaced
-the nofixincludes patch (because it doesn't apply cleanly) with a sed
-command.</para></listitem>
-
 </itemizedlist>
 
 <para>4.0-RC1 - September 28th, 2002</para>

chapter05/gcc-exp.xml

@@ -6,7 +6,7 @@ This patch fixes a few bugs. In particular it contains the "copy fix" and
 "var fix" documented at 
 <ulink url="http://www.zipworld.com.au/~gschafer/lfs-tweaks.html"/>.</para>
 
-<para><userinput>sed '/$(SHELL) .\/fixinc.sh/d':</userinput>
+<para><userinput>patch -Np1 -i ../gcc-3.2-nofixincludes-2.patch:</userinput>
 This prevents the fixincludes script from running.</para>
 
 <para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard

chapter05/gcc-inst.xml

@@ -15,9 +15,7 @@ been warned.</para>
 <para>Install GCC by running the following commands:</para>
 
 <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
-cp gcc/Makefile.in{,.backup} &amp;&amp;
-sed '/$(SHELL) .\/fixinc.sh/d' \
-&nbsp;&nbsp;&nbsp; gcc/Makefile.in.backup > gcc/Makefile.in &amp;&amp;
+patch -Np1 -i ../gcc-3.2-nofixincludes-2.patch &amp;&amp;
 mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \

index.xml

@@ -15,7 +15,7 @@
 <!ENTITY hints-index "http://hints.linuxfromscratch.org/hints.shtml">
 <!ENTITY blfs-root "http://beyond.linuxfromscratch.org/">
 
-<!ENTITY all-version "cvs-20020929-1306">
+<!ENTITY all-version "cvs-20020929-1556">
 <!ENTITY all-size-kb "105,560 KB">
 <!ENTITY all-size-mb "103.88 MB">