From 970a126c28d18ccec2d6b08dc51ab367de4a4455 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 9 Apr 2012 19:14:33 +0000
Subject: Update networking bootscripts.  See bootscripts change log for
 details.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9807 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/automake.xml | 14 +++++++-------
 chapter06/gcc.xml      | 12 +++---------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 49641233e..109da7059 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -70,11 +70,11 @@
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>acinstall, aclocal, aclocal-&automake-version;, automake,
-        automake-&automake-version;, compile, config.guess, config.sub,
+        <seg>acinstall, aclocal, aclocal-&am-minor-version;, automake,
+        automake-&am-minor-version;, compile, config.guess, config.sub,
         depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
         py-compile, symlink-tree, and ylwrap</seg>
-        <seg>/usr/share/aclocal-1.11, /usr/share/automake-1.11,
+        <seg>/usr/share/aclocal-&am-minor-version;, /usr/share/automake-&am-minor-version;,
         /usr/share/doc/automake-&automake-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -106,11 +106,11 @@
       </varlistentry>
 
       <varlistentry id="aclocalversion">
-        <term><command>aclocal-&automake-version;</command></term>
+        <term><command>aclocal-&am-minor-version;</command></term>
         <listitem>
           <para>A hard link to <command>aclocal</command></para>
           <indexterm zone="ch-system-automake aclocalversion">
-            <primary sortas="b-aclocal-&automake-version;">aclocal-&automake-version;</primary>
+            <primary sortas="b-aclocal-&am-minor-version;">aclocal-&am-minor-version;</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -133,11 +133,11 @@
       </varlistentry>
 
       <varlistentry id="automake-version">
-        <term><command>automake-&automake-version;</command></term>
+        <term><command>automake-&am-minor-version;</command></term>
         <listitem>
           <para>A hard link to <command>automake</command></para>
           <indexterm zone="ch-system-automake automake-version">
-            <primary sortas="b-automake-&automake-version;">automake-&automake-version;</primary>
+            <primary sortas="b-automake-&am-minor-version;">automake-&am-minor-version;</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 5f8c2e16b..c18eb1404 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -289,16 +289,10 @@ SEARCH_DIR("/usr/lib");</computeroutput></screen>
     href="readjusting.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-    <para>Finally, move a misplced file:</para>
+    <para>Finally, move a misplaced file:</para>
 
-<screen><userinput remap="install">case `uname -m` in
-  i?86) GDBDIR=/usr/share/gdb/auto-load/usr/lib/   ;;
-  *)    GDBDIR=/usr/share/gdb/auto-load/usr/lib64/ ;;
-esac
-
-mkdir -pv $GDBDIR
-mv -v /usr/lib/*gdb.py $GDBDIR
-unset GDBDIR</userinput></screen>
+<screen><userinput remap="install">mkdir -pv /usr/share/gdb/auto-load/usr/lib
+mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
 
   </sect2>
 
-- 
cgit v1.2.3-54-g00ecf