From dd06b538b57f5f10ad8138576ad6ebf9fe7a6c69 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 18 Feb 2013 21:33:51 +0000
Subject: Update to texinfo-5.0 and linux-3.7.9.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10162 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/gcc.xml       |  7 +++++++
 chapter06/inetutils.xml |  5 +++--
 chapter06/texinfo.xml   | 25 +++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index f15144dae..1ecbf524c 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -48,6 +48,13 @@
 
 <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/chapter06/inetutils.xml b/chapter06/inetutils.xml
index e773724aa..59e5862dd 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -119,10 +119,11 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install
+<screen><userinput remap="install">make install</userinput></screen>
+<!-- The html file generation is broken as of texinfo-5.0
 make -C doc html
 make -C doc install-html docdir=/usr/share/doc/inetutils-&inetutils-version;</userinput></screen>
-
+-->
     <para>Move some programs so they are available if <filename
     class='directory'>/usr</filename> is not accessable:</para>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 67a9f6b72..3bac8536c 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -100,8 +100,8 @@ done</userinput></screen>
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>info, infokey, install-info, makeinfo, pdftexi2dvi, texi2dvi, texi2pdf, and
-        texindex</seg>
+        <seg>info, infokey, install-info, makeinfo, pdftexi2dvi, 
+        pod2texi, texi2any, texi2dvi, texi2pdf, and texindex</seg>
         <seg>/usr/share/texinfo</seg>
       </seglistitem>
     </segmentedlist>
@@ -168,6 +168,27 @@ done</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="pod2texi">
+        <term><command>pod2texi</command></term>
+        <listitem>
+          <para>Converts Pod to Texinfo format</para>
+          <indexterm zone="ch-system-texinfo pod2texi">
+            <primary sortas="b-pod2texi">pod2texi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="texi2any">
+        <term><command>texi2any</command></term>
+        <listitem>
+          <para>Translate Texinfo source documentation to 
+          various other formats</para>
+          <indexterm zone="ch-system-texinfo texi2any">
+            <primary sortas="b-texiany">texi2any</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="texi2dvi">
         <term><command>texi2dvi</command></term>
         <listitem>
-- 
cgit v1.2.3-54-g00ecf