From f6ea270237ee119265e6917c71fdd3ccbd7f1f3d Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Sun, 26 May 2002 20:48:08 +0000
Subject: removed tooldir from c5-binutils - not needed here, moved explanation
 to chap6

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1911 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml     | 4 ++++
 chapter05/binutils-exp.xml  | 9 ---------
 chapter05/binutils-inst.xml | 4 ++--
 chapter06/binutils-exp.xml  | 9 +++++++++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c27fe45f9..c87aba039 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -27,6 +27,10 @@
 
 </para></listitem>
 
+<listitem><para>May 26th, 2002 [gerard]: Chapter 05+06 - Binutils: Removed
+the tooldir setting from chapter 05-binutils, moved its description to
+chapter 06-binutils.</para></listitem>
+
 <listitem><para>May 26th, 2002 [gerard]: Chapter 05 - Gawk &amp; Findutils:
 simplified the installation by removing the libexecdir modifications. We
 can live with a
diff --git a/chapter05/binutils-exp.xml b/chapter05/binutils-exp.xml
index 1f631d55f..a1a226d35 100644
--- a/chapter05/binutils-exp.xml
+++ b/chapter05/binutils-exp.xml
@@ -14,14 +14,5 @@ statically.</para>
 <para><userinput>LDFLAGS=-all-static:</userinput> Setting the variable LDFLAGS
 to the value -all-static causes binutils to be linked statically.</para>
 
-<para><userinput>tooldir=$LFS/usr:</userinput> Normally, the tooldir (the
-directory where the executables from binutils end up in) is set to
-$(exec_prefix)/$(target_alias) which expands into, for example, 
-/usr/i686-pc-linux-gnu. Since we only build for our own system, we don't
-need this target specific directory in $LFS/usr. That setup would be used
-if the system was used to cross-compile (for example 
-compiling a package on the Intel machine that generates code that can be
-executed on Apple PowerPC machines).</para>
-
 </sect2>
 
diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml
index 26d1fb232..460b8c8f3 100644
--- a/chapter05/binutils-inst.xml
+++ b/chapter05/binutils-inst.xml
@@ -14,8 +14,8 @@ warned.</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 tooldir=$LFS/static LDFLAGS=-all-static &amp;&amp;
-make tooldir=$LFS/static install</userinput></screen></para>
+make LDFLAGS=-all-static &amp;&amp;
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter06/binutils-exp.xml b/chapter06/binutils-exp.xml
index fb149b60f..1f171f937 100644
--- a/chapter06/binutils-exp.xml
+++ b/chapter06/binutils-exp.xml
@@ -1,6 +1,15 @@
 <sect2>
 <title>Command explanations</title>
 
+<para><userinput>tooldir=/usr:</userinput> Normally, the tooldir (the
+directory where the executables from binutils end up in) is set to
+$(exec_prefix)/$(target_alias) which expands into, for example, 
+/usr/i686-pc-linux-gnu. Since we only build for our own system, we don't
+need this target specific directory in /usr. That setup would be used
+if the system was used to cross-compile (for example 
+compiling a package on the Intel machine that generates code that can be
+executed on Apple PowerPC machines).</para>
+
 <para><userinput>make tooldir=/usr install-info:</userinput> This will
 install binutil's info pages.</para>
 
-- 
cgit v1.2.3-54-g00ecf