From 93ee74805cd776050b416141450ce167eb442e73 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 8 Dec 2007 23:46:45 +0000
Subject: Updated to Texinfo-4.11. Fixes #2074.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8439 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/binutils.xml |  5 +++++
 chapter06/texinfo.xml  | 15 +--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 24770bb17..b747c97ce 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -56,6 +56,11 @@ Ask your system administrator to create more.</computeroutput></screen>
     <para>This issue needs to be resolved before running the test suites
     for Binutils and GCC.</para>
 
+    <para>Binutils does not recognize versions of Texinfo newer than 4.9.  Fix
+    this issue by applying the following patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-configure-patch;</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 69916295a..447580764 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -41,19 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
-    <para>The <command>info</command> program makes assumptions such as that
-    a string occupies the same number of character cells on the screen and
-    bytes in memory and that one can break the string anywhere, which fail
-    in UTF-8 based locales. The patch below makes them valid by falling back
-    to English messages when a multibyte locale is in use:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-multibyte-patch;</userinput></screen>
-
-    <para>Texinfo allows local users to overwrite arbitrary files via a symlink
-    attack on temporary files. Apply the following patch to fix this:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-tempfile_fix-patch;</userinput></screen>
-
     <para>Prepare Texinfo for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
@@ -64,7 +51,7 @@
 
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make -k check</userinput></screen>
 
     <para>Install the package:</para>
 
-- 
cgit v1.2.3-54-g00ecf