move adjusting toolchain back to where it belonged

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

5 files changed, 40 insertions, 60 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d31576932..fa74df214 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -82,9 +82,6 @@
 </itemizedlist>
 </para></listitem>
 
-<listitem><para>August 17th, 2003 [alex]: Moved the adjusting of the toolchain
-from chapter 6 to the end of chapter 5.</para></listitem>
-
 <listitem><para>August 17th, 2003 [alex]: Chapter 05 - From Bash to Perl:
 put text in between commands. Added a section on stripping unneeded
 symbols to decrease the size of the tools.</para></listitem>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index f21f931e8..7d8cd2951 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -36,59 +36,6 @@
 &c5-perl;
 
 
-<sect1 id="ch05-adjustingtoolchain">
-<title>Re-adjusting the toolchain</title>
-<?dbhtml filename="adjustingtoolchain.html" dir="chapter05"?>
-
-<para>Now that we have compiled all the necessary tools, it is time to
-re-adjust our toolchain. We will set it up so that it will link any newly
-compiled program against the new Glibc, which is the first thing to get
-compiled in the next chapter. Basically, this is the reverse of what we did
-in the "Locking in" stage in the beginning of this chapter.</para>
-
-<para>The first thing to do is to adjust the linker scripts. For this we
-retained the <filename>binutils-build</filename> directory from the second
-pass over Binutils. Do the following:</para>
-
-<para><screen><userinput>cd binutils-build
-make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
-
-<para>This installs the adjusted linker scripts. The linker scripts now contain
-no mention of <filename>/stage1/lib</filename>. From now on every compiled
-program will link <emphasis>only</emphasis> against the libraries in
-<filename>/usr/lib</filename> and <filename>/lib</filename>. The extra
-<userinput>INSTALL=/stage1/bin/install</userinput> is needed because the
-Makefile created during the second pass still contains the reference to
-<filename>/usr/bin/install</filename>, which we obviously haven't installed
-yet.</para>
-
-<para>You can now remove the Binutils source and build directories.</para>
-
-<para>The next thing to do is to amend our GCC specs file so that it points to
-the new dynamic linker. Just like earlier on, we use a sed to accomplish
-this:</para>
-
-<para><screen><userinput>CURRENTSPECFILE=/stage1/lib/gcc-lib/*/*/specs
-sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \
-&nbsp;&nbsp;&nbsp;&nbsp;$CURRENTSPECFILE > newspecfile
-mv newspecfile $CURRENTSPECFILE
-unset CURRENTSPECFILE</userinput></screen></para>
-
-<para>Again, cutting and pasting the above is recommended. And just like
-before, it is a good idea to check the linker scripts and the specs file to
-ensure the intended changes were actually made.</para>
-
-<para>Note that the linker scripts will still contain a reference to
-<filename>/stage1/i686-pc-linux-gnu/lib</filename>. This is unavoidable, but
-luckily does not present a problem. There are no libraries in that location
-as all the temporary stage1 libraries are located in
-<filename>/stage1/lib</filename>.</para>
-
-</sect1>
-
-
-
 <sect1 id="ch05-stripping">
 <title>Stripping</title>
 <?dbhtml filename="stripping.html" dir="chapter05"?>
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index e1001d236..f302cd014 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -2,14 +2,49 @@
 <title>Adjusting toolchain</title>
 <?dbhtml filename="adjustingtoolchain.html" dir="chapter06"?>
 
+<para>Now that we have compiled all the necessary tools, it is time to
+re-adjust our toolchain. We will set it up so that it will link any newly
+compiled program against the new Glibc. Basically, this is the reverse of
+what we did in the "Locking in" stage in the beginning of chapter 5.</para>
+
+<para>The first thing to do is to adjust the linker scripts. For this we
+retained the <filename class="directory">binutils-build</filename>
+directory from the second pass over Binutils. Run the following:</para>
+
 <para><screen><userinput>cd binutils-build
-make -C ld INSTALL=/stage1/bin/install install-data-local
+make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
+
+<para>This installs the adjusted linker scripts. The linker scripts contain
+no mention of <filename class="directory">/stage1/lib</filename> anymore.
+From now on every compiled program will link <emphasis>only</emphasis>
+against the libraries in <filename>/usr/lib</filename> and
+<filename>/lib</filename>. The extra
+<userinput>INSTALL=/stage1/bin/install</userinput> is needed because the
+Makefile created during the second pass still contains the reference to
+<filename>/usr/bin/install</filename>, which we obviously haven't installed
+yet.</para>
+
+<para>You can now remove the Binutils source and build directories.</para>
 
-SPECFILE=/stage1/lib/gcc-lib/*/*/specs
+<para>The next thing to do is to amend our GCC specs file so that it points
+to the new dynamic linker. Just like earlier on, we use a sed to accomplish
+this:</para>
+
+<para><screen><userinput>SPECFILE=/stage1/lib/gcc-lib/*/*/specs
 sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \
 &nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' $SPECFILE > XX
 mv XX $SPECFILE
 unset SPECFILE</userinput></screen></para>
 
+<para>Again, cutting and pasting the above is recommended. And just like
+before, it is a good idea to check the linker scripts and the specs file o
+ensure the intended changes were actually made.</para>
+
+<para>Note that the linker scripts will still contain a reference to
+<filename class="directory">/stage1/i686-pc-linux-gnu/lib</filename>. This
+is unavoidable, but luckily does not present a problem. There are no
+libraries in that location as all the temporary stage1 libraries are
+located in <filename class="directory">/stage1/lib</filename>.</para>
+
 </sect1>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 8c7683a94..d3843cbb2 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -14,6 +14,7 @@
 &c6-kernel;
 &c6-manpages;
 &c6-glibc;
+&c6-adjustingtoolchain;
 &c6-binutils;
 &c6-gcc;
 &c6-coreutils;
diff --git a/index.xml b/index.xml
index 28baa74d2..d7ac274e2 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20030817">
-<!ENTITY releasedate "August 17th, 2003">
+<!ENTITY version "20030819">
+<!ENTITY releasedate "August 19th, 2003">
 <!ENTITY nbsp " ">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">