From 4e179e7764f6b382a4b33d61c49112698c11ff3b Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Fri, 29 Mar 2013 11:27:05 +0000
Subject: [PATCH] Remove instructions to prevent the building of GCC's info
 files.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10228 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 11 +++++++++++
 chapter05/gcc-pass1.xml |  5 -----
 chapter05/gcc-pass2.xml |  5 -----
 chapter06/gcc.xml       |  7 -------
 general.ent             |  4 ++--
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 10c17218b..2ff76e43d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2013-03-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Remove the now unnecessary instructions that
+          prevented GCC's info files from being built; GCC-4.8.0 contains
+          upstream fixes.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2013-03-28</para>
       <itemizedlist>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index ca4f4defe..cd7c4e0ba 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -105,11 +105,6 @@ done</userinput></screen>
 
 <screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen>
 
-    <para>Do not build the .info files.  They are not needed here and 
-    are broken with the current version of <command>makeinfo</command>.</para>
-
-<screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
-
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 7ca724ce9..60c9f467d 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -97,11 +97,6 @@ mv -v gmp-&gmp-version; gmp
 tar -zxf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>Again, do not build the .info files.  They are not needed here and
-    are broken with the current version of <command>makeinfo</command>.</para>
-
-    <screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
-
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../gcc-build
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 2489c111a..b36cf66dc 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -48,13 +48,6 @@
 
 <screen><userinput remap="pre">sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
 
-    <para>Again, do not build the .info files. They are broken with the current
-    version of <command>makeinfo</command>.</para>
-
-    <screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
-
-
-
     <para>As in <xref linkend="ch-tools-gcc-pass2"/>, apply the following
     <command>sed</command> to force the build to use the
     <option>-fomit-frame-pointer</option> compiler flag in order to ensure
diff --git a/general.ent b/general.ent
index 531e9ce05..eb6e98cb2 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20130328">
-<!ENTITY releasedate "March 28, 2013">
+<!ENTITY version "SVN-20130329">
+<!ENTITY releasedate "March 29, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.4">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->