Applied Alex' "apapting-the-text.patch" patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2639 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 24 insertions, 16 deletions

diff --git a/chapter05/glibc-inst.xml b/chapter05/glibc-inst.xml
index 499b2ae02..b8e84de43 100644
--- a/chapter05/glibc-inst.xml
+++ b/chapter05/glibc-inst.xml
@@ -15,11 +15,11 @@ default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
 them when building Glibc.</para>
 
 <para>Basically, compiling Glibc in any other way than the book suggests
-is putting your system at a very high risk.</para>
+is putting the stability of your system at risk.</para>
 
 <para>Though it is a harmless message, the install stage of Glibc will
-complain about the presence of /etc/ld.so.conf (or lack thereof). Fix
-this annoying little error:</para>
+complain about the absence of <filename>/etc/ld.so.conf</filename>.
+Fix this annoying little error with:</para>
 
 <para><screen><userinput>mkdir /stage1/etc
 touch /stage1/etc/ld.so.conf</userinput></screen></para>
@@ -38,7 +38,7 @@ cd ../glibc-build</userinput></screen></para>
 &nbsp;&nbsp;&nbsp;&nbsp;--with-binutils=/stage1/bin \
 &nbsp;&nbsp;&nbsp;&nbsp;--without-gd</userinput></screen></para>
 
-<para>The meaning of the configure options are:</para>
+<para>The meaning of the new configure options is:</para>
 
 <itemizedlist>
 <listitem><para><userinput>--disable-profile</userinput>: This disables the
@@ -46,11 +46,18 @@ building of the libraries with profiling information. Omit this option if you
 plan to do profiling.</para></listitem>
 
 <listitem><para><userinput>--enable-add-ons</userinput>: This enables any
-add-ons that we installed with Glibc, in our case Linuxthreads.</para></listitem>
-
-<listitem><para><userinput>--libexecdir=/usr/bin</userinput>: This will
-cause the <filename>pt_chown</filename> program to be installed in the
-<filename>/usr/bin</filename> directory.</para></listitem>
+add-ons that were installed with Glibc, in our case Linuxthreads.</para></listitem>
+
+<listitem><para><userinput>--with-binutils=/stage1/bin</userinput> and
+<userinput>--with-headers=/stage1/include</userinput>: Strictly speaking
+these switches are not required. But they ensure nothing can go wrong with
+regard to what kernel headers and Binutils programs get used during the
+Glibc build.</para></listitem>
+
+<listitem><para><userinput> --without-gd</userinput>: This switch ensures
+that we don't build the <userinput>memusagestat</userinput> program, which
+strangely enough insists on linking against the host's libraries (libgd,
+libpng, libz, and so forth).</para></listitem>
 </itemizedlist>
 
 <para>During this stage you will see the following warning:</para>
@@ -76,16 +83,17 @@ would require you to regenerate the binary files.</para>
 make check
 make install</userinput></screen></para>
 
-<para>The locales (used by Glibc to make your Linux system talk in a different
-language) weren't installed when you ran the previous command, so we have to
-do that ourselves now:</para>
+<para>The locales (used by Glibc to make your Linux system respond in a
+different language) weren't installed when you ran the previous command,
+so we have to do that ourselves now:</para>
 
 <para><screen><userinput>make localedata/install-locales</userinput></screen></para>
 
-<para>An alternative to running the previous command is to install only those
-locales which you need or want. This can be achieved using the localedef
-command. Information on this can be found in the <filename>INSTALL</filename>
-file in the <filename>glibc-&glibc-version;</filename> tree.</para>
+<para>An alternative to running the previous command is to install only
+those locales which you need or want. This can be achieved by using the
+<userinput>localedef</userinput> command. Information on this can be
+found in the <filename>INSTALL</filename> file in the
+<filename>glibc-&glibc-version;</filename> tree.</para>
 
 </sect2>