From 1bbb24b645cd7038d141c6a20dcdf23aeeb592bf Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Sat, 11 Jan 2003 16:18:59 +0000
Subject: rewrote bash install page

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2306 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/binutils-exp.xml  | 18 ------------------
 chapter05/binutils-inst.xml | 33 ++++++++++++++++++++++++++++-----
 chapter05/binutils.xml      |  5 ++---
 3 files changed, 30 insertions(+), 26 deletions(-)
 delete mode 100644 chapter05/binutils-exp.xml

(limited to 'chapter05')

diff --git a/chapter05/binutils-exp.xml b/chapter05/binutils-exp.xml
deleted file mode 100644
index 2b6983510..000000000
--- a/chapter05/binutils-exp.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>mkdir ../binutils-build:</userinput> The installation
-instructions for Binutils recommend creating a separate build directory
-instead of compiling the package inside the source tree. So, we create a
-binutils-build directory and work from there.</para>
-
-<para><userinput>--disable-nls:</userinput> This option disables
-internationalization (also known as i18n). We don't need this for our
-static programs and nls often causes problems when you're linking
-statically.</para>
-
-<para><userinput>LDFLAGS="-all-static":</userinput> Setting the variable LDFLAGS
-to the value -all-static causes binutils to be linked statically.</para>
-
-</sect2>
-
diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml
index 118762fcb..c03606a48 100644
--- a/chapter05/binutils-inst.xml
+++ b/chapter05/binutils-inst.xml
@@ -8,14 +8,37 @@ that override default optimizations, such as CFLAGS and CXXFLAGS, we
 recommend unsetting or modifying them when building binutils. You have been
 warned.</para>
 
-<para>Install Binutils by running the following commands:</para>
+<para>It is recommended by the Binutils installation documentation to build
+Binutils outside of the source directory in a dedicated directory:</para>
 
+<para><screen><userinput>mkdir ../binutils-build
+cd ../binutils-build</userinput></screen></para>
 
-<para><screen><userinput>mkdir ../binutils-build &amp;&amp;
-cd ../binutils-build &amp;&amp;
-../binutils-&binutils-version;/configure --prefix=$LFS/static --disable-nls &amp;&amp;
-make LDFLAGS="-all-static" &amp;&amp;
+<para>Next, prepare Binutils to be compiled:</para>
+
+<para><screen><userinput>../binutils-&binutils-version;/configure --prefix=$LFS/static --disable-nls</userinput></screen></para>
+
+<para>The meaning of the (new) configure switches are:</para>
+
+<itemizedlist>
+<listitem><para><userinput>--disable-nls:</userinput> This option disables
+internationalization (also known as i18n). We don't need this for our
+static programs and nls often causes problems when you're linking
+statically.</para></listitem>
+</itemizedlist>
+
+<para>We'll finish off by compiling and installing the package:</para>
+
+<para><screen><userinput>make LDFLAGS="-all-static" &amp;&amp;
 make install</userinput></screen></para>
 
+<para><emphasis>make LDFLAGS="-all-static"</emphasis> is how we tell
+Binutils that all programs should be statically linked. Setting the
+<emphasis>LDFLAGS</emphasis> variable is the common way of specifying we
+want a static link to take place, however, its value and the way it is set
+is not always the same. You'll see with the remaining packages that there
+are different ways of setting up the <emphasis>LDFLAGS</emphasis>
+variable.</para>
+
 </sect2>
 
diff --git a/chapter05/binutils.xml b/chapter05/binutils.xml
index b52a71942..f3661ccbc 100644
--- a/chapter05/binutils.xml
+++ b/chapter05/binutils.xml
@@ -5,10 +5,9 @@
 <screen>Estimated build time:           &binutils-time-static;
 Estimated required disk space:  &binutils-compsize-static;</screen>
 
-&c5-binutils-inst;
-&c5-binutils-exp;
-&aa-binutils-desc;
+&aa-binutils-shortdesc;
 &aa-binutils-dep;
+&c5-binutils-inst;
 
 </sect1>
 
-- 
cgit v1.2.3-54-g00ecf