Replaced nofixincludes patch (it doesn't apply cleanly) with a (more appropriate) sed command.

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

chapter01/changelog.xml

@@ -61,6 +61,10 @@
 </itemizedlist>
 </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>
+
 <listitem><para>September 28th, 2002 [gerard]: Chapter 05 - GCC: Added the
 nofixincludes patch to prevent that script from running in Chapter
 05. It should run in Chapter 06, so we need it to be a seperate

chapter04/gcc-patch.xml

@@ -1,7 +1,3 @@
 GCC Patch (&gcc-patch-version;) - &gcc-patch-size;:
 <ulink url="&ftp;/gcc-&gcc-patch-version;.patch.bz2"/>
 <ulink url="&http;/gcc-&gcc-patch-version;.patch.bz2"/>
-
-GCC nofixincludes Patch:
-<ulink url="&ftp;/gcc-&gcc-version;-nofixincludes.patch.bz2"/>
-<ulink url="&http;/gcc-&gcc-version;-nofixincludes.patch.bz2"/>

chapter05/gcc-exp.xml

@@ -6,8 +6,8 @@ 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>patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch:</userinput>
-This patch prevents the fixincludes script from running.</para>
+<para><userinput>sed '/$(SHELL) .\/fixinc.sh/d':</userinput>
+This prevents the fixincludes script from running.</para>
 
 <para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard
 codes some paths while compiling and so we need to pass /static as the

chapter05/gcc-inst.xml

@@ -15,7 +15,8 @@ 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;
-patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch &amp;&amp;
+cp gcc/Makefile.in{,.backup} &amp;&amp;
+sed '/$(SHELL) .\/fixinc.sh/d' gcc/Makefile.in.backup > gcc/Makefile.in &amp;&amp;
 mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \