Index: BOOK/Makefile
===================================================================
--- BOOK/Makefile	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/Makefile	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -58,5 +58,5 @@
 	echo "Troubleshooting $$arch..." ; \
         xmllint --xinclude --nonet --postvalid $(PWD)/$$arch-index.xml > /tmp/dump-$$arch ; \
-	xmllint --xinclude --noout --nonet --valid /tmp/dump-$$ach ; \
+	xmllint --xinclude --noout --nonet --valid /tmp/dump-$$arch ; \
 	echo "You can now look at /tmp/dump-$$arch to see the errors"
 endef
Index: BOOK/alpha-index.xml
===================================================================
--- BOOK/alpha-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/alpha-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/alpha-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/alpha-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/alpha-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/alpha-chapter.xml"/>
Index: BOOK/boot/common/settingenviron.xml
===================================================================
--- BOOK/boot/common/settingenviron.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/boot/common/settingenviron.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,9 +31,9 @@
   <para>By putting <filename class="directory">/tools/bin</filename> at
   the end of the standard <envar>PATH</envar>, all the programs installed in
-  <xref linkend="chapter-temporary-tools"/> are only picked up by the shell
+  <xref linkend="chapter-temp-system"/> are only picked up by the shell
   if they have not yet been built on the target system. This configuration
   forces use of the final system binaries as they are built over the 
-  temporary-tools, minimising the chance final system programs being built
-  against the temporary-tools.</para>
+  temp-system, minimising the chance final system programs being built
+  against the temp-system.</para>
 
 </sect1>
Index: BOOK/final-preps/abouttestsuites.xml
===================================================================
--- BOOK/final-preps/abouttestsuites.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/final-preps/abouttestsuites.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -30,10 +30,10 @@
     <para>Experience has shown that there is little to be gained
     from running the test suites in <xref
-    linkend="chapter-temporary-tools"/>. There can be no escaping the fact
+    linkend="chapter-testsuite-tools"/>. There can be no escaping the fact
     that the host system always exerts some influence on the tests in that
     chapter, often causing inexplicable failures. Because the tools built
-    in <xref linkend="chapter-temporary-tools"/> are temporary and
+    in <xref linkend="chapter-testsuite-tools"/> are temporary and
     eventually discarded, we do not recommend running the test suites in
-    <xref linkend="chapter-temporary-tools"/> for the average reader. The
+    <xref linkend="chapter-testsuite-tools"/> for the average reader. The
     instructions for running those test suites are provided for the
     benefit of testers and developers, but they are strictly
@@ -47,5 +47,5 @@
   <systemitem class="filesystem">devpts</systemitem> file system set up
   correctly. This issue is discussed in greater detail in <xref
-  linkend="chapter-temporary-tools"/>.</para>
+  linkend="chapter-testsuite-tools"/>.</para>
 
   <para>Sometimes package test suites will fail, but for reasons which the
Index: BOOK/final-preps/creatingtoolsdir.xml
===================================================================
--- BOOK/final-preps/creatingtoolsdir.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/final-preps/creatingtoolsdir.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -11,5 +11,5 @@
   <title>Creating the $LFS/tools Directory</title>
 
-  <para>All programs compiled in <xref linkend="chapter-temporary-tools"/>
+  <para>All programs compiled in <xref linkend="chapter-temp-system"/>
   will be installed under <filename class="directory">$LFS/tools</filename>
   to keep them separate from the programs compiled in <xref
@@ -19,5 +19,5 @@
   after their use. This also prevents these programs from ending up in the
   host production directories (easy to do by accident in <xref
-  linkend="chapter-temporary-tools"/>).</para>
+  linkend="chapter-temp-system"/>).</para>
 
   <para>Create the required directory by running the following as
Index: BOOK/introduction/common/how.xml
===================================================================
--- BOOK/introduction/common/how.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/introduction/common/how.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -40,8 +40,8 @@
   <xref linkend="chapter-final-preps"/> carefully as it explains several
   important issues the developer should be aware of before beginning to
-  work through <xref linkend="chapter-temporary-tools"/> and
+  work through <xref linkend="chapter-temp-system"/> and
   beyond.</para>
 
-  <para><xref linkend="chapter-temporary-tools"/> explains the
+  <para><xref linkend="chapter-temp-system"/> explains the
   installation of a number of packages that will form the basic
   development suite (or toolchain) which is used to build the actual
@@ -50,5 +50,5 @@
   to compile a compiler, you need a compiler.</para>
 
-  <para><xref linkend="chapter-temporary-tools"/> also shows the user
+  <para><xref linkend="chapter-temp-system"/> also shows the user
   how to build a first pass of the toolchain, including Binutils and GCC
   (first pass basically means these two core packages will be re-installed
@@ -57,5 +57,5 @@
   a second pass of the toolchain will be built. This time, the toolchain
   will be dynamically linked against the newly built Glibc. The remaining
-  <xref linkend="chapter-temporary-tools"/> packages are built using this
+  <xref linkend="chapter-temp-system"/> packages are built using this
   second pass toolchain. When this is done, the LFS installation process
   will no longer depend on the host distribution, with the exception of the
@@ -64,5 +64,5 @@
   <para>This effort to isolate the new system from the host distribution
   may seem excessive, but a full technical explanation is provided at the
-  beginning of <xref linkend="chapter-temporary-tools"/>.</para>
+  beginning of <xref linkend="chapter-temp-system"/>.</para>
 
   <para>In <xref linkend="chapter-building-system"/>, the full LFS system is
Index: BOOK/mips-index.xml
===================================================================
--- BOOK/mips-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/mips-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -57,5 +57,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/mips-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips-chapter.xml"/>
Index: BOOK/mips64-64-index.xml
===================================================================
--- BOOK/mips64-64-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/mips64-64-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -57,5 +57,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/mips64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips64-chapter.xml"/>
Index: BOOK/mips64-index.xml
===================================================================
--- BOOK/mips64-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/mips64-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -57,5 +57,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/mips64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips64-chapter.xml"/>
Index: BOOK/ppc-index.xml
===================================================================
--- BOOK/ppc-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/ppc-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/ppc-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/ppc-chapter.xml"/>
Index: BOOK/sparc-index.xml
===================================================================
--- BOOK/sparc-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/sparc-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/sparc-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc-chapter.xml"/>
Index: BOOK/sparc64-64-index.xml
===================================================================
--- BOOK/sparc64-64-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/sparc64-64-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/sparc64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc64-chapter.xml"/>
Index: BOOK/sparc64-index.xml
===================================================================
--- BOOK/sparc64-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/sparc64-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/sparc64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc64-chapter.xml"/>
Index: BOOK/sparcv8-index.xml
===================================================================
--- BOOK/sparcv8-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/sparcv8-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/sparc-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparcv8-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc-chapter.xml"/>
Index: BOOK/temp-system/64/perl.xml
===================================================================
--- BOOK/temp-system/64/perl.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/temp-system/64/perl.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-temp-system-perl" role="wrap">
+  <?dbhtml filename="perl.html"?>
+
+  <title>Perl-&perl-version;</title>
+
+  <indexterm zone="ch-temp-system-perl">
+    <primary sortas="a-Perl">Perl</primary>
+    <secondary>temporary tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/perl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Perl</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="e"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX'</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+<screen os="m"><userinput>cp config.sh{,.orig}
+   sed -e "s@\(^ar=\).*@\1'${AR}'@g" config.sh.orig > config.sh
+   cp config.sh{,.orig}
+   sed -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" config.sh.orig > config.sh
+   cp config.sh{,.orig}
+   sed -e "s@\(^cc=\).*@\1'${CC} ${BUILD64}'@g" config.sh.orig > config.sh
+   cp config.sh{,.orig}
+   sed -e "s@\(^ld=\).*@\1'${CC} ${BUILD64}'@g" config.sh.orig > config.sh</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-perl" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/temp-system/alpha-chapter.xml
===================================================================
--- BOOK/temp-system/alpha-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/alpha-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,4 +31,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/common/perl.xml
===================================================================
--- BOOK/temp-system/common/perl.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/temp-system/common/perl.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-temp-tools-perl" role="wrap">
+  <?dbhtml filename="perl.html"?>
+
+  <title>Perl-&perl-version;</title>
+
+  <indexterm zone="ch-temp-tools-perl">
+    <primary sortas="a-Perl">Perl</primary>
+    <secondary>temporary tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/perl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Perl</title>
+
+    <para os="a">First adapt some hard-wired paths to the C library by applying
+    the following patch:</para>
+
+<screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
+
+   <para os="c">We will now make a change so we can make a cross-compiled version of
+   perl. We will change the permissions on the files we need to update, so we
+   can make a change. This change will rename miniperl to miniperl-cross:</para>
+
+<screen os="d"><userinput>chmod 755 ext/util/make_ext
+cp ext/util/make_ext{,.orig}
+sed -e 's/miniperl/miniperl-cross/g' ext/util/make_ext.orig > ext/util/make_ext 
+chmod 755 x2p/Makefile.SH
+cp x2p/Makefile.SH{,.orig}
+sed -e 's/miniperl/miniperl-cross/g' x2p/Makefile.SH.orig > x2p/Makefile.SH
+chmod 755 utils/Makefile
+cp utils/Makefile{,.orig}
+sed -e 's/miniperl/miniperl-cross/g' utils/Makefile.orig > utils/Makefile</userinput></screen>
+
+    <para os="e">Prepare Perl for compilation (make sure to get the 'Data/Dumper
+    IO Fcntl POSIX' part of the command correct&mdash;they are all letters):</para>
+
+<screen os="f"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX'</userinput></screen>
+
+    <variablelist os="g">
+      <title>The meaning of the configure option:</title>
+
+      <varlistentry>
+        <term><parameter>-Dstatic_ext='Data/Dumper IO Fcntl POSIX'</parameter></term>
+        <listitem>
+          <para>This tells Perl to build the minimum set of static
+          extensions needed for installing and testing the Coreutils
+          package in the next chapter.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para os="h">We will now make a host miniperl and rename it to miniperl-cross:</para>
+
+<screen os="i"><userinput>make miniperl
+mv miniperl miniperl-cross
+make clean</userinput></screen>
+
+    <para os="j">We will now edit the main Makefile to use our newly created miniperl-cross:</para>
+
+<screen os="k"><userinput>cp Makefile{,.orig}
+sed -e 's|(LDLIBPTH) ./miniperl|(LDLIBPTH) ./miniperl-cross|g' Makefile.orig > Makefile</userinput></screen>
+
+   <para os="l">We will now make perl cross-compile friendly by forcing it to use our
+   cross-tools we have created:</para>
+
+<screen os="m"><userinput>cp config.sh{,.orig}
+   sed -e "s@\(^ar=\).*@\1'${AR}'@g" config.sh.orig > config.sh
+   cp config.sh{,.orig}
+   sed -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" config.sh.orig > config.sh
+   cp config.sh{,.orig}
+   sed -e "s@\(^cc=\).*@\1'${CC} ${BUILD32}'@g" config.sh.orig > config.sh
+   cp config.sh{,.orig}
+   sed -e "s@\(^ld=\).*@\1'${CC} ${BUILD32}'@g" config.sh.orig > config.sh</userinput></screen>
+
+  <para os="n">Now we are ready to make our cross-compiled perl:</para>
+
+<screen os="o"><userinput>make miniperl
+make perl utilities</userinput></screen>
+
+    <para os="p">Install these tools and their libraries:</para>
+
+<screen os="q"><userinput>cp perl pod/pod2man /tools/bin
+install -d /tools/lib/perl5/&perl-version;
+cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-perl" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/temp-system/common/texinfo.xml
===================================================================
--- BOOK/temp-system/common/texinfo.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/temp-system/common/texinfo.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-temp-system-texinfo" role="wrap">
+  <?dbhtml filename="texinfo.html"?>
+
+  <title>Texinfo-&texinfo-version;</title>
+
+  <indexterm zone="ch-temp-system-texinfo">
+    <primary sortas="a-Texinfo">Texinfo</primary>
+    <secondary>temporary tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/texinfo.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Texinfo</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=/tools \
+   --host=${LFS_TARGET} </userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-texinfo" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/temp-system/mips-chapter.xml
===================================================================
--- BOOK/temp-system/mips-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/mips-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,4 +31,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/mips64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,4 +31,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/mips64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/mips64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -35,4 +35,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/multilib/texinfo.xml
===================================================================
--- BOOK/temp-system/multilib/texinfo.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/temp-system/multilib/texinfo.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-temp-system-texinfo" role="wrap">
+  <?dbhtml filename="texinfo.html"?>
+
+  <title>Texinfo-&texinfo-version;</title>
+
+  <indexterm zone="ch-temp-system-texinfo">
+    <primary sortas="a-Texinfo">Texinfo</primary>
+    <secondary>temporary system</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/texinfo.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Texinfo</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
+   --host=${LFS_TARGET}</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-texinfo" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/temp-system/ppc-chapter.xml
===================================================================
--- BOOK/temp-system/ppc-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/ppc-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+<?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
@@ -31,4 +30,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/sparc-chapter.xml
===================================================================
--- BOOK/temp-system/sparc-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/sparc-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,4 +31,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/sparc64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,4 +31,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/sparc64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/sparc64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -33,4 +33,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/sparcv8-chapter.xml
===================================================================
--- BOOK/temp-system/sparcv8-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/sparcv8-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,4 +31,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/x86-chapter.xml
===================================================================
--- BOOK/temp-system/x86-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/x86-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,4 +31,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/x86_64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -31,4 +31,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/x86_64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/temp-system/x86_64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -33,4 +33,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: OK/temp-tools/64/perl.xml
===================================================================
--- BOOK/temp-tools/64/perl.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-perl" role="wrap">
-  <?dbhtml filename="perl.html"?>
-
-  <title>Perl-&perl-version;</title>
-
-  <indexterm zone="ch-temp-tools-perl">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
-   -Dcc="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/64/tcl.xml
===================================================================
--- BOOK/temp-tools/64/tcl.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-tcl" role="wrap">
-  <?dbhtml filename="tcl.html"?>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="ch-temp-tools-tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(id('contents-tcl'))"/>
-
-</sect1>
Index: OK/temp-tools/alpha-chapter.xml
===================================================================
--- BOOK/temp-tools/alpha-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/common/dejagnu.xml
===================================================================
--- BOOK/temp-tools/common/dejagnu.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-dejagnu" role="wrap">
-  <?dbhtml filename="dejagnu.html"?>
-
-  <title>DejaGNU-&dejagnu-version;</title>
-
-  <indexterm zone="ch-temp-tools-dejagnu">
-    <primary sortas="a-DejaGNU">DejaGNU</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The DejaGNU package contains a framework for testing other
-    programs.</para>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils,
-        GCC, Glibc, Grep, Make, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DejaGNU</title>
-
-    <para os="a">Prepare DejaGNU for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
-
-    <para os="c">Build and install the package:</para>
-
-<screen os="d"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-dejagnu" role="content">
-    <title>Contents of DejaGNU</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>runtest</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="runtest">
-        <term><command>runtest</command></term>
-        <listitem>
-          <para>A wrapper script that locates the proper
-          <command>expect</command> shell and then runs DejaGNU</para>
-          <indexterm zone="ch-temp-tools-dejagnu runtest">
-            <primary sortas="b-runtest">runtest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/common/expect.xml
===================================================================
--- BOOK/temp-tools/common/expect.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-expect" role="wrap">
-  <?dbhtml filename="expect.html"?>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="ch-temp-tools-expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Expect package contains a program for carrying out scripted
-    dialogues with other interactive programs.</para>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils,
-        GCC, Glibc, Grep, Make, Sed, and Tcl</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-    <para os="a">First, fix a bug that can result in false failures during the GCC
-    test suite run:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
-
-    <para os="c">Now prepare Expect for compilation:</para>
-
-<screen os="d"><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-tcl=/tools/lib</parameter></term>
-        <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary temp-tools location.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e2">
-        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
-        <listitem>
-          <para>This explicitly tells Expect where to find Tcl's internal headers.
-           Using this option avoids conditions
-          where <command>configure</command> fails because it cannot
-          automatically discover the location of the Tcl source directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e3">
-        <term><parameter>--with-x=no</parameter></term>
-        <listitem>
-          <para>This tells the configure script not to search for Tk
-          (the Tcl GUI component) or the X Window System libraries, both of
-          which may reside on the host system but will not exist when
-          building the final system.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Build the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make SCRIPTS="" install</userinput></screen>
-
-    <variablelist os="k">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>SCRIPTS=""</parameter></term>
-        <listitem>
-          <para>This prevents installation of the supplementary expect
-          scripts, which are not needed.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-expect" role="content">
-    <title>Contents of Expect</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>expect</seg>
-        <seg>libexpect-&expect-lib-version;.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="expect">
-        <term><command>expect</command></term>
-        <listitem>
-          <para>Communicates with other interactive programs according
-          to a script</para>
-          <indexterm zone="ch-temp-tools-expect expect">
-            <primary sortas="b-expect">expect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpect">
-        <term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
-        <listitem>
-          <para>Contains functions that allow Expect to be used as a Tcl
-          extension or to be used directly from C or C++ (without Tcl)</para>
-          <indexterm zone="ch-temp-tools-expect libexpect">
-            <primary sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/common/introduction.xml
===================================================================
--- BOOK/temp-tools/common/introduction.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter builds the tools needed to run the tests
-  that the packages have. I.e., <command>make check</command></para>
-
-  <para>It will also build any specific non cross-compiled
-  packages for our system.</para>
-
-</sect1>
Index: OK/temp-tools/common/perl.xml
===================================================================
--- BOOK/temp-tools/common/perl.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-perl" role="wrap">
-  <?dbhtml filename="perl.html"?>
-
-  <title>Perl-&perl-version;</title>
-
-  <indexterm zone="ch-temp-tools-perl">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <para os="a">First adapt some hard-wired paths to the C library by applying
-    the following patch:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
-
-    <para os="c">Prepare Perl for compilation (make sure to get the 'Data/Dumper
-    IO Fcntl POSIX' part of the command correct&mdash;they are all letters):</para>
-
-<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX'</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>-Dstatic_ext='Data/Dumper IO Fcntl POSIX'</parameter></term>
-        <listitem>
-          <para>This tells Perl to build the minimum set of static
-          extensions needed for installing and testing the Coreutils
-          package in the next chapter.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Only a few of the utilities contained in this package need to be
-    built:</para>
-
-<screen os="g"><userinput>make perl utilities</userinput></screen>
-
-    <para os="h">Although Perl comes with a test suite, it is not recommended to
-    run it at this point. Only part of Perl was built and running
-    <userinput>make test</userinput> now will cause the rest of Perl to be
-    built as well, which is unnecessary at this point. The test suite can
-    be run in the next chapter if desired.</para>
-
-    <para os="i">Install these tools and their libraries:</para>
-
-<screen os="j"><userinput>cp perl pod/pod2man /tools/bin
-install -d /tools/lib/perl5/&perl-version;
-cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/common/tcl.xml
===================================================================
--- BOOK/temp-tools/common/tcl.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-tcl" role="wrap">
-  <?dbhtml filename="tcl.html"?>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="ch-temp-tools-tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Tcl package contains the Tool Command Language.</para>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils,
-        GCC, Glibc, Grep, Make, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <para os="a">This package and the next two (Expect and DejaGNU) are installed
-    to support running the test suites for GCC and Binutils. Installing
-    three packages for testing purposes may seem excessive, but it is very
-    reassuring, if not essential, to know that the most important tools are
-    working properly. Even if the test suites are not run in this chapter
-    (they are not mandatory), these packages are required to run the test
-    suites in <xref linkend="chapter-building-system"/>.</para>
-
-    <para os="c1">First, fix a syntax error in the configure script.</para>
-
-<screen os="c2"><userinput>cd unix
-sed -i "s/relid'/relid/" configure</userinput></screen>
-
-    <para os="b">Prepare Tcl for compilation:</para>
-
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-    <para os="d">Build the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Now we will install the TCL headers into /tools.</para>
-
-<screen os="j"><userinput>make install-private-headers</userinput></screen>
-
-    <para os="k">Now make a necessary symbolic link:</para>
-
-<screen os="l"><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-tcl" role="content">
-    <title>Contents of Tcl</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>tclsh (link to tclsh8.4) and tclsh8.4</seg>
-        <seg>libtcl8.4.so</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tclsh8.4">
-        <term><command>tclsh8.4</command></term>
-        <listitem>
-          <para>The Tcl command shell</para>
-          <indexterm zone="ch-temp-tools-tcl tclsh8.4">
-            <primary sortas="b-tclsh8.4">tclsh8.4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh">
-        <term><command>tclsh</command></term>
-        <listitem>
-          <para>A link to tclsh8.4</para>
-          <indexterm zone="ch-temp-tools-tcl tclsh">
-            <primary sortas="b-tclsh">tclsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtcl8.4.so">
-        <term><filename class="libraryfile">libtcl8.4.so</filename></term>
-        <listitem>
-          <para>The Tcl library</para>
-          <indexterm zone="ch-temp-tools-tcl libtcl8.4.so">
-            <primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/common/texinfo.xml
===================================================================
--- BOOK/temp-tools/common/texinfo.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-temp-tools-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/texinfo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-texinfo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/common/tree.xml
===================================================================
--- BOOK/temp-tools/common/tree.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-tree" role="wrap">
-  <?dbhtml filename="tree.html"?>
-
-  <title>Tree-&tree-version;</title>
-
-  <indexterm zone="ch-temp-tools-tree">
-    <primary sortas="a-Tree">Tree</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Tree package contains a program for compiling packages.</para>
-
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
-
-      <seglistitem>
-        <seg>GCC and Coreutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tree</title>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">Install the package:</para>
-
-<screen os="d"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-tree" role="content">
-    <title>Contents of Tree</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>tree</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tree">
-        <term><command>tree</command></term>
-        <listitem>
-          <para>Tree will list contents of directories in a tree-like format.</para>
-          <indexterm zone="ch-temp-tools-tree tree">
-            <primary sortas="b-tree">tree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/mips-chapter.xml
===================================================================
--- BOOK/temp-tools/mips-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-tools/mips64-64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/mips64-chapter.xml
===================================================================
--- BOOK/temp-tools/mips64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/mips64/flags.xml
===================================================================
--- BOOK/temp-tools/mips64/flags.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="-mabi=32"
-export BUILDN32="-mabi=n32"
-export BUILD64="-mabi=64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for o32 bit:</para>
-
-<screen><userinput>export LFS_TARGET32="`echo ${MACH_TYPE}| sed -e 's/64//g'`"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/temp-tools/multilib/expect-64bit.xml
===================================================================
--- BOOK/temp-tools/multilib/expect-64bit.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-expect" role="wrap">
-  <?dbhtml filename="expect64.html"?>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="ch-temp-tools-expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
-   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
-   --libdir=/tools/lib64 --with-x=no</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-tcl=/tools/lib64</parameter></term>
-        <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary temp-tools location.</para>
-        </listitem>
-      </varlistentry>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-        href="../common/expect.xml"
-        xpointer="xpointer(//*[@os='e2'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-        href="../common/expect.xml"
-        xpointer="xpointer(//*[@os='e3'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(id('contents-expect'))"/>
-
-</sect1>
Index: OK/temp-tools/multilib/perl.xml
===================================================================
--- BOOK/temp-tools/multilib/perl.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-perl" role="wrap">
-  <?dbhtml filename="perl.html"?>
-
-  <title>Perl-&perl-version;</title>
-
-  <indexterm zone="ch-temp-tools-perl">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <para os="m1">We need a working Perl to build glibc and test coreutils, it
-    doesn't matter whether this is a 32-bit or a 64-bit program. But, the perl
-    configure process knows nothing about multilib and assumes it will be installed
-    in a 'lib' directory.  Using the same patch as for non-multilib systems we can
-    easily install into <filename class="directory">/tools/lib</filename>.</para>
-
-    <para os="m2">Installing successfully into a different directory such as
-    <filename class="directory">/tools/lib64</filename> would require more effort
-   (compare how we install Perl in the final system) for no real gain. On this
-   multilib system, <filename class="directory">/tools/lib</filename> is where we
-   install 32-bit libraries, so for consistency we will build a 32-bit Perl here.
-   </para> 
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
-   -Dcc="gcc ${BUILD32}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/multilib/tcl-64bit.xml
===================================================================
--- BOOK/temp-tools/multilib/tcl-64bit.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-tcl" role="wrap">
-  <?dbhtml filename="tcl-64bit.html"?>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="ch-temp-tools-tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <para os="m1">We need to change the default lib path to lib64:</para>
-
-<screen os="m2"><userinput>sed -i 's@\$(prefix)/lib@\$(prefix)/lib64@g' Makefile.in
-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(id('contents-tcl'))"/>
-
-</sect1>
Index: OK/temp-tools/multilib/texinfo.xml
===================================================================
--- BOOK/temp-tools/multilib/texinfo.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-temp-tools-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/texinfo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-texinfo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-tools/ppc-chapter.xml
===================================================================
--- BOOK/temp-tools/ppc-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/sparc-chapter.xml
===================================================================
--- BOOK/temp-tools/sparc-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-
-</chapter>
Index: OK/temp-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-tools/sparc64-64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/sparc64-chapter.xml
===================================================================
--- BOOK/temp-tools/sparc64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-
-</chapter>
Index: OK/temp-tools/sparc64/flags.xml
===================================================================
--- BOOK/temp-tools/sparc64/flags.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for 32 bit:</para>
-
-<screen><userinput>export LFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/temp-tools/x86-chapter.xml
===================================================================
--- BOOK/temp-tools/x86-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-tools/x86_64-64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/x86_64-chapter.xml
===================================================================
--- BOOK/temp-tools/x86_64-chapter.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temporary-tools" xreflabel="Constructing Temporary Tools">
-  <?dbhtml dir="temp-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/temp-tools/x86_64/flags.xml
===================================================================
--- BOOK/temp-tools/x86_64/flags.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for 32 bit:</para>
-
-<screen><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: BOOK/testsuite-tools/64/tcl.xml
===================================================================
--- BOOK/testsuite-tools/64/tcl.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/64/tcl.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-tcl" role="wrap">
+  <?dbhtml filename="tcl.html"?>
+
+  <title>Tcl-&tcl-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-tcl">
+    <primary sortas="a-Tcl">Tcl</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/tcl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Tcl</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/tcl.xml"
+  xpointer="xpointer(id('contents-tcl'))"/>
+
+</sect1>
Index: BOOK/testsuite-tools/alpha-chapter.xml
===================================================================
--- BOOK/testsuite-tools/alpha-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/alpha-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/common/dejagnu.xml
===================================================================
--- BOOK/testsuite-tools/common/dejagnu.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/common/dejagnu.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-dejagnu" role="wrap">
+  <?dbhtml filename="dejagnu.html"?>
+
+  <title>DejaGNU-&dejagnu-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-dejagnu">
+    <primary sortas="a-DejaGNU">DejaGNU</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The DejaGNU package contains a framework for testing other
+    programs.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils,
+        GCC, Glibc, Grep, Make, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of DejaGNU</title>
+
+    <para os="a">Prepare DejaGNU for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
+
+    <para os="c">Build and install the package:</para>
+
+<screen os="d"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-dejagnu" role="content">
+    <title>Contents of DejaGNU</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+
+      <seglistitem>
+        <seg>runtest</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="runtest">
+        <term><command>runtest</command></term>
+        <listitem>
+          <para>A wrapper script that locates the proper
+          <command>expect</command> shell and then runs DejaGNU</para>
+          <indexterm zone="ch-testsuite-tools-dejagnu runtest">
+            <primary sortas="b-runtest">runtest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/testsuite-tools/common/expect.xml
===================================================================
--- BOOK/testsuite-tools/common/expect.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/common/expect.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-expect" role="wrap">
+  <?dbhtml filename="expect.html"?>
+
+  <title>Expect-&expect-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-expect">
+    <primary sortas="a-Expect">Expect</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Expect package contains a program for carrying out scripted
+    dialogues with other interactive programs.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils,
+        GCC, Glibc, Grep, Make, Sed, and Tcl</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Expect</title>
+
+    <para os="a">First, fix a bug that can result in false failures during the GCC
+    test suite run:</para>
+
+<screen os="b"><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
+
+    <para os="c">Now prepare Expect for compilation:</para>
+
+<screen os="d"><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
+   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
+
+    <variablelist os="e">
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry os="e1">
+        <term><parameter>--with-tcl=/tools/lib</parameter></term>
+        <listitem>
+          <para>This ensures that the configure script finds the Tcl
+          installation in the temporary testsuite-tools location.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="e2">
+        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
+        <listitem>
+          <para>This explicitly tells Expect where to find Tcl's internal headers.
+           Using this option avoids conditions
+          where <command>configure</command> fails because it cannot
+          automatically discover the location of the Tcl source directory.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="e3">
+        <term><parameter>--with-x=no</parameter></term>
+        <listitem>
+          <para>This tells the configure script not to search for Tk
+          (the Tcl GUI component) or the X Window System libraries, both of
+          which may reside on the host system but will not exist when
+          building the final system.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para os="f">Build the package:</para>
+
+<screen os="g"><userinput>make</userinput></screen>
+
+    <para os="i">Install the package:</para>
+
+<screen os="j"><userinput>make SCRIPTS="" install</userinput></screen>
+
+    <variablelist os="k">
+      <title>The meaning of the make parameter:</title>
+
+      <varlistentry>
+        <term><parameter>SCRIPTS=""</parameter></term>
+        <listitem>
+          <para>This prevents installation of the supplementary expect
+          scripts, which are not needed.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+  <sect2 id="contents-expect" role="content">
+    <title>Contents of Expect</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+      <segtitle>Installed library</segtitle>
+
+      <seglistitem>
+        <seg>expect</seg>
+        <seg>libexpect-&expect-lib-version;.a</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="expect">
+        <term><command>expect</command></term>
+        <listitem>
+          <para>Communicates with other interactive programs according
+          to a script</para>
+          <indexterm zone="ch-testsuite-tools-expect expect">
+            <primary sortas="b-expect">expect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libexpect">
+        <term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
+        <listitem>
+          <para>Contains functions that allow Expect to be used as a Tcl
+          extension or to be used directly from C or C++ (without Tcl)</para>
+          <indexterm zone="ch-testsuite-tools-expect libexpect">
+            <primary sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/testsuite-tools/common/introduction.xml
===================================================================
--- BOOK/testsuite-tools/common/introduction.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/common/introduction.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-introduction">
+  <?dbhtml filename="introduction.html"?>
+
+  <title>Introduction</title>
+
+  <para>This chapter builds the tools needed to run the tests
+  that the packages have. I.e., <command>make check</command></para>
+
+</sect1>
Index: BOOK/testsuite-tools/common/tcl.xml
===================================================================
--- BOOK/testsuite-tools/common/tcl.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/common/tcl.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-tcl" role="wrap">
+  <?dbhtml filename="tcl.html"?>
+
+  <title>Tcl-&tcl-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-tcl">
+    <primary sortas="a-Tcl">Tcl</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Tcl package contains the Tool Command Language.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils,
+        GCC, Glibc, Grep, Make, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Tcl</title>
+
+    <para os="a">This package and the next two (Expect and DejaGNU) are installed
+    to support running the test suites for GCC and Binutils. Installing
+    three packages for testing purposes may seem excessive, but it is very
+    reassuring, if not essential, to know that the most important tools are
+    working properly. Even if the test suites are not run in this chapter
+    (they are not mandatory), these packages are required to run the test
+    suites in <xref linkend="chapter-building-system"/>.</para>
+
+    <para os="c1">First, fix a syntax error in the configure script.</para>
+
+<screen os="c2"><userinput>cd unix
+sed -i "s/relid'/relid/" configure</userinput></screen>
+
+    <para os="b">Prepare Tcl for compilation:</para>
+
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
+
+    <para os="d">Build the package:</para>
+
+<screen os="e"><userinput>make</userinput></screen>
+
+    <para os="g">Install the package:</para>
+
+<screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">Now we will install the TCL headers into /tools.</para>
+
+<screen os="j"><userinput>make install-private-headers</userinput></screen>
+
+    <para os="k">Now make a necessary symbolic link:</para>
+
+<screen os="l"><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-tcl" role="content">
+    <title>Contents of Tcl</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
+
+      <seglistitem>
+        <seg>tclsh (link to tclsh8.4) and tclsh8.4</seg>
+        <seg>libtcl8.4.so</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="tclsh8.4">
+        <term><command>tclsh8.4</command></term>
+        <listitem>
+          <para>The Tcl command shell</para>
+          <indexterm zone="ch-testsuite-tools-tcl tclsh8.4">
+            <primary sortas="b-tclsh8.4">tclsh8.4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tclsh">
+        <term><command>tclsh</command></term>
+        <listitem>
+          <para>A link to tclsh8.4</para>
+          <indexterm zone="ch-testsuite-tools-tcl tclsh">
+            <primary sortas="b-tclsh">tclsh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtcl8.4.so">
+        <term><filename class="libraryfile">libtcl8.4.so</filename></term>
+        <listitem>
+          <para>The Tcl library</para>
+          <indexterm zone="ch-testsuite-tools-tcl libtcl8.4.so">
+            <primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/testsuite-tools/common/tree.xml
===================================================================
--- BOOK/testsuite-tools/common/tree.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/common/tree.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-tree" role="wrap">
+  <?dbhtml filename="tree.html"?>
+
+  <title>Tree-&tree-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-tree">
+    <primary sortas="a-Tree">Tree</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Tree package contains a program for compiling packages.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>GCC and Coreutils</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Tree</title>
+
+    <para os="a">Compile the package:</para>
+
+<screen os="b"><userinput>make</userinput></screen>
+
+    <para os="c">Install the package:</para>
+
+<screen os="d"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-tree" role="content">
+    <title>Contents of Tree</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+
+      <seglistitem>
+        <seg>tree</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="tree">
+        <term><command>tree</command></term>
+        <listitem>
+          <para>Tree will list contents of directories in a tree-like format.</para>
+          <indexterm zone="ch-testsuite-tools-tree tree">
+            <primary sortas="b-tree">tree</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/testsuite-tools/mips-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/mips-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/mips64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/mips64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/mips64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/mips64/flags.xml
===================================================================
--- BOOK/testsuite-tools/mips64/flags.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/mips64/flags.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-flags">
+  <?dbhtml filename="flags.html"?>
+
+  <title>Build Flags</title>
+
+  <para>We will need to setup target specific flags for the compiler
+  and linkers.</para>
+
+<screen><userinput>export BUILD32="-mabi=32"
+export BUILDN32="-mabi=n32"
+export BUILD64="-mabi=64"</userinput></screen>
+
+  <para>You will need to set your host target triplet for o32 bit:</para>
+
+<screen><userinput>export LFS_TARGET32="`echo ${MACH_TYPE}| sed -e 's/64//g'`"</userinput></screen>
+
+   <para>To prevent errors when you come back to your build, we will export these
+   variables to prevent any build issues in the future:</para>
+
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
+echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ~/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
+echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+
+</sect1>
Index: BOOK/testsuite-tools/multilib/expect-64bit.xml
===================================================================
--- BOOK/testsuite-tools/multilib/expect-64bit.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/multilib/expect-64bit.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-expect" role="wrap">
+  <?dbhtml filename="expect64.html"?>
+
+  <title>Expect-&expect-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-expect">
+    <primary sortas="a-Expect">Expect</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expect</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
+   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
+   --libdir=/tools/lib64 --with-x=no</userinput></screen>
+
+    <variablelist os="e">
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry os="e1">
+        <term><parameter>--with-tcl=/tools/lib64</parameter></term>
+        <listitem>
+          <para>This ensures that the configure script finds the Tcl
+          installation in the temporary tools location.</para>
+        </listitem>
+      </varlistentry>
+
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+        href="../common/expect.xml"
+        xpointer="xpointer(//*[@os='e2'])"/>
+
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+        href="../common/expect.xml"
+        xpointer="xpointer(//*[@os='e3'])"/>
+
+    </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(id('contents-expect'))"/>
+
+</sect1>
Index: BOOK/testsuite-tools/multilib/tcl-64bit.xml
===================================================================
--- BOOK/testsuite-tools/multilib/tcl-64bit.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/multilib/tcl-64bit.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-tcl" role="wrap">
+  <?dbhtml filename="tcl-64bit.html"?>
+
+  <title>Tcl-&tcl-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-tcl">
+    <primary sortas="a-Tcl">Tcl</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/tcl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Tcl</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c2'])"/>
+
+    <para os="m1">We need to change the default lib path to lib64:</para>
+
+<screen os="m2"><userinput>sed -i 's@\$(prefix)/lib@\$(prefix)/lib64@g' Makefile.in
+</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/tcl.xml"
+  xpointer="xpointer(id('contents-tcl'))"/>
+
+</sect1>
Index: BOOK/testsuite-tools/ppc-chapter.xml
===================================================================
--- BOOK/testsuite-tools/ppc-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/ppc-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/sparc-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/sparc-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/sparc64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/sparc64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/sparc64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/sparc64/flags.xml
===================================================================
--- BOOK/testsuite-tools/sparc64/flags.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/sparc64/flags.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-flags">
+  <?dbhtml filename="flags.html"?>
+
+  <title>Build Flags</title>
+
+  <para>We will need to setup target specific flags for the compiler
+  and linkers.</para>
+
+<screen><userinput>export BUILD32="-m32"
+export BUILD64="-m64"</userinput></screen>
+
+  <para>You will need to set your host target triplet for 32 bit:</para>
+
+<screen><userinput>export LFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+
+   <para>To prevent errors when you come back to your build, we will export these
+   variables to prevent any build issues in the future:</para>
+
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
+echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+
+</sect1>
Index: BOOK/testsuite-tools/x86-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/x86-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86_64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/x86_64-64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/x86_64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86_64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/x86_64-chapter.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
+  <?dbhtml dir="testsuite-tools"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Constructing a Testsuite Tools</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
+
+</chapter>
Index: BOOK/testsuite-tools/x86_64/flags.xml
===================================================================
--- BOOK/testsuite-tools/x86_64/flags.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
+++ BOOK/testsuite-tools/x86_64/flags.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-testsuite-tools-flags">
+  <?dbhtml filename="flags.html"?>
+
+  <title>Build Flags</title>
+
+  <para>We will need to setup target specific flags for the compiler
+  and linkers.</para>
+
+<screen><userinput>export BUILD32="-m32"
+export BUILD64="-m64"</userinput></screen>
+
+  <para>You will need to set your host target triplet for 32 bit:</para>
+
+<screen><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+
+   <para>To prevent errors when you come back to your build, we will export these
+   variables to prevent any build issues in the future:</para>
+
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
+echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
+
+</sect1>
Index: BOOK/x86-index.xml
===================================================================
--- BOOK/x86-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/x86-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/x86-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86-chapter.xml"/>
Index: BOOK/x86_64-64-index.xml
===================================================================
--- BOOK/x86_64-64-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/x86_64-64-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/x86_64-64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86_64-64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86_64-chapter.xml"/>
Index: BOOK/x86_64-index.xml
===================================================================
--- BOOK/x86_64-index.xml	(revision 628632d684ccdee4a07dbc29a535dbc61b946ced)
+++ BOOK/x86_64-index.xml	(revision 134ba96eb2a2d9b33540ffe0b3d6112da6531c58)
@@ -59,5 +59,5 @@
     <title>Building the LFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-tools/x86_64-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86_64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86_64-chapter.xml"/>
