diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index cf8987a7e..b9a7bce08 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -6,15 +6,14 @@ +September 29th, 2002 [gerard]: Chapter 05 - GCC: Fixed the +old nofixincludes patch and reinstated it. + 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. -September 29th, 2002 [timothy]: Chapter 05 - GCC: Replaced -the nofixincludes patch (because it doesn't apply cleanly) with a sed -command. - 4.0-RC1 - September 28th, 2002 diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index ae6d923ac..4ea02babf 100644 --- a/chapter05/gcc-exp.xml +++ b/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 . -sed '/$(SHELL) .\/fixinc.sh/d': +patch -Np1 -i ../gcc-3.2-nofixincludes-2.patch: This prevents the fixincludes script from running. --prefix=/static: This is NOT a typo. GCC hard diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 150faca41..997b7b7fb 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -15,9 +15,7 @@ been warned. Install GCC by running the following commands: patch -Np1 -i ../gcc-&gcc-patch-version;.patch && -cp gcc/Makefile.in{,.backup} && -sed '/$(SHELL) .\/fixinc.sh/d' \ -    gcc/Makefile.in.backup > gcc/Makefile.in && +patch -Np1 -i ../gcc-3.2-nofixincludes-2.patch && mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \ diff --git a/index.xml b/index.xml index 3ca0c5b9c..b198c1c9d 100644 --- a/index.xml +++ b/index.xml @@ -15,7 +15,7 @@ - +