From 3dc9543a1ecaf9e380274b64d85bca7e3d90784a Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 18 Feb 2014 07:16:55 +0000
Subject: Change kmod instructions to allow installation of man pages. Numerous
 whitespace fixes.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10480 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/binutils-pass1.xml |  2 +-
 chapter05/binutils-pass2.xml |  2 +-
 chapter05/expect.xml         |  5 +++--
 chapter05/gcc-pass2.xml      |  2 +-
 chapter05/libstdc++.xml      | 14 +++++++-------
 chapter05/stripping.xml      |  5 +++--
 6 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'chapter05')

diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 6766005fa..decec8b6f 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -72,7 +72,7 @@ cd ../binutils-build</userinput></screen>
 
     <para>Now prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../binutils-&binutils-version;/configure   \
+<screen><userinput remap="configure">../binutils-&binutils-version;/configure     \
     --prefix=/tools            \
     --with-sysroot=$LFS        \
     --with-lib-path=/tools/lib \
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 69d0e3ff3..9ebf763e7 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -53,7 +53,7 @@ cd ../binutils-build</userinput></screen>
 <screen><userinput remap="configure">CC=$LFS_TGT-gcc                \
 AR=$LFS_TGT-ar                 \
 RANLIB=$LFS_TGT-ranlib         \
-../binutils-&binutils-version;/configure   \
+../binutils-&binutils-version;/configure     \
     --prefix=/tools            \
     --disable-nls              \
     --with-lib-path=/tools/lib \
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index d53394504..ae6f50026 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -51,8 +51,9 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
 
     <para>Now prepare Expect for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools --with-tcl=/tools/lib \
-  --with-tclinclude=/tools/include</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools       \
+            --with-tcl=/tools/lib \
+            --with-tclinclude=/tools/include</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index e96c469ad..6fb0792c4 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -77,7 +77,7 @@ esac</userinput></screen>
 do
   cp -uv $file{,.orig}
   sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&amp;@g' \
-  -e 's@/usr@/tools@g' $file.orig &gt; $file
+      -e 's@/usr@/tools@g' $file.orig &gt; $file
   echo '
 #undef STANDARD_STARTFILE_PREFIX_1
 #undef STANDARD_STARTFILE_PREFIX_2
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 9a6ad2415..23d0a3a4a 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -56,13 +56,13 @@ cd ../gcc-build</userinput></screen>
     <para>Prepare Libstdc++ for compilation:</para>
 
 <screen><userinput remap="configure">../gcc-&gcc-version;/libstdc++-v3/configure \
-    --host=$LFS_TGT                      \
-    --prefix=/tools                      \
-    --disable-multilib                   \
-    --disable-shared                     \
-    --disable-nls                        \
-    --disable-libstdcxx-threads          \
-    --disable-libstdcxx-pch              \
+    --host=$LFS_TGT                 \
+    --prefix=/tools                 \
+    --disable-multilib              \
+    --disable-shared                \
+    --disable-nls                   \
+    --disable-libstdcxx-threads     \
+    --disable-libstdcxx-pch         \
     --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
 
     <variablelist>
diff --git a/chapter05/stripping.xml b/chapter05/stripping.xml
index 2d8fe6568..ad2cb3ae0 100644
--- a/chapter05/stripping.xml
+++ b/chapter05/stripping.xml
@@ -16,10 +16,11 @@
   debugging symbols. Remove those symbols with:</para>
 
 <screen><userinput>strip --strip-debug /tools/lib/*
-strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
+/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
 
   <para>These commands will skip a number of files, reporting that it does not
-  recognize their file format. Most of these are scripts instead of binaries.</para>
+  recognize their file format. Most of these are scripts instead of binaries.
+  Also use the system strip command to include the strip binary in /tools.</para>
 
   <para>Take care <emphasis>not</emphasis> to use
   <parameter>--strip-unneeded</parameter> on the libraries. The static
-- 
cgit v1.2.3-54-g00ecf