From 9ff6ff3fb3c97a2413c498fe26097dab76855e56 Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Mon, 20 Oct 2008 14:56:53 +0000
Subject: GCC 4.3.2 uses a new location for fixed includes. Fix scripts in
 chapter 5's adjusting toolchain section to use it.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8684 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter05/adjusting.xml |  8 ++++----
 general.ent             |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 16c9049d7..d692a0037 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
 
+    <listitem>
+      <para>2008-10-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - GCC 4.3.2 uses a new directory for fixed includes. Fixed
+          the adjust toolchain scripts to point to the new location.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-10-19</para>
       <itemizedlist>
diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index 60c4781c3..fb3f51dc6 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -66,10 +66,10 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
   their length):</para>
 
 <!-- && used to ease copy and pasting -->
-<screen><userinput>GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include &amp;&amp;
-find ${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; &amp;&amp;
-rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_INCLUDEDIR}/*` &amp;&amp;
-unset GCC_INCLUDEDIR</userinput></screen>
+<screen><userinput>GCC_FIXED=`dirname $(gcc -print-libgcc-file-name)`/include-fixed &amp;&amp;
+find ${GCC_FIXED}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; &amp;&amp;
+rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_FIXED}/*` &amp;&amp;
+unset GCC_FIXED</userinput></screen>
 
   <caution>
     <para>At this point, it is imperative to stop and ensure that the basic
diff --git a/general.ent b/general.ent
index fc2738885..22064dfeb 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20081019">
-<!ENTITY releasedate "October 19, 2008">
+<!ENTITY version "SVN-20081020">
+<!ENTITY releasedate "October 20, 2008">
 <!ENTITY copyrightdate "1999&ndash;2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
-- 
cgit v1.2.3-54-g00ecf