Index: BOOK/chroot/sparc64-64/flags.xml
===================================================================
--- BOOK/chroot/sparc64-64/flags.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/chroot/sparc64-64/flags.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -22,10 +22,10 @@
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../../cross-tools/sparc64-64/flags.xml"
-   xpointer="xpointer(//*[@os='e'])"/>
+   href="../../final-preps/sparc64-64/variables.xml"
+   xpointer="xpointer(//*[@os='k'])"/>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../../cross-tools/sparc64-64/flags.xml"
-   xpointer="xpointer(//*[@os='f'])"/>
+   href="../../final-preps/sparc64-64/variables.xml"
+   xpointer="xpointer(//*[@os='l'])"/>
 
 </sect1>
Index: BOOK/chroot/sparc64/flags.xml
===================================================================
--- BOOK/chroot/sparc64/flags.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/chroot/sparc64/flags.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -31,10 +31,10 @@
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../../cross-tools/sparc64/flags.xml"
-   xpointer="xpointer(//*[@os='e'])"/>
+   href="../../final-preps/sparc64/variables.xml"
+   xpointer="xpointer(//*[@os='k'])"/>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../../cross-tools/sparc64/flags.xml"
-   xpointer="xpointer(//*[@os='f'])"/>
+   href="../../final-preps/sparc64/variables.xml"
+   xpointer="xpointer(//*[@os='l'])"/>
 
 </sect1>
Index: OK/cross-tools/64/flags.xml
===================================================================
--- BOOK/cross-tools/64/flags.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-    and linkers.</para>
-
-  <screen os="b"><userinput>export BUILD64="-m64"</userinput></screen>
-
-  <para os="c">Now add the build flags to <filename>~/.bashrc</filename> to
-    prevent issues if we stop and come back later.</para>
-
-  <screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: BOOK/cross-tools/mips-chapter.xml
===================================================================
--- BOOK/cross-tools/mips-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/mips-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
Index: OK/cross-tools/mips/variables.xml
===================================================================
--- BOOK/cross-tools/mips/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <para os="aa">For a MIPS Little Endian Machine:</para>
-
-<screen os="ab"><userinput>export CLFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
-
-    <para os="ac">For a MIPS Big Endian Machine:</para>
-
-<screen os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-64-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/mips64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,6 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
Index: OK/cross-tools/mips64-64/flags.xml
===================================================================
--- BOOK/cross-tools/mips64-64/flags.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="-mabi=64"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='d'])"/>
-
-</sect1>
Index: OK/cross-tools/mips64-64/variables.xml
===================================================================
--- BOOK/cross-tools/mips64-64/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips64/variables.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips64/variables.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/mips64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/mips64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,6 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
Index: OK/cross-tools/mips64/flags.xml
===================================================================
--- BOOK/cross-tools/mips64/flags.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../multilib/flags.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD32="-mabi=32"
-export BUILDN32="-mabi=n32"
-export BUILD64="-mabi=64"</userinput></screen>
-
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../multilib/flags.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILDN32="${BUILDN32}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/cross-tools/mips64/variables.xml
===================================================================
--- BOOK/cross-tools/mips64/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-<screen os="ab"><userinput>export CLFS_TARGET="mips64el-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-<screen os="ad"><userinput>export CLFS_TARGET="mips64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/multilib/flags.xml
===================================================================
--- BOOK/cross-tools/multilib/flags.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linker:</para>
-
-<screen os="b"><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para os="c">Now add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later:</para>
-
-<screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
Index: BOOK/cross-tools/ppc-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/ppc-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
Index: OK/cross-tools/ppc/variables.xml
===================================================================
--- BOOK/cross-tools/ppc/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/ppc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-64-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/ppc64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,6 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
Index: OK/cross-tools/ppc64-64/variables.xml
===================================================================
--- BOOK/cross-tools/ppc64-64/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/ppc64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/ppc64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,6 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
Index: OK/cross-tools/ppc64/variables.xml
===================================================================
--- BOOK/cross-tools/ppc64/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/sparc-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/sparc-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
Index: OK/cross-tools/sparc/variables.xml
===================================================================
--- BOOK/cross-tools/sparc/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-64-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/sparc64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,6 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
Index: OK/cross-tools/sparc64-64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/flags.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <title>Build Flags</title>
-  <?dbhtml filename="flags.html"?>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
-export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export BUILD64="${BUILD64}"
-export GCCTARGET="${GCCTARGET}"
-EOF</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../sparc64/flags.xml"
-   xpointer="xpointer(//*[@os='e'])"/>
-
-  <table os="f">
-    <title>List of architectures, target triplets, and recommended book</title>
-    <?dbfo table-width="7in" ?>
-
-    <tgroup cols="3">
-
-      <colspec colnum="1" colwidth="1in"   colname="Processor"/>
-      <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
-      <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>BUILD64</entry>
-          <entry>GCCTARGET</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>Ultrasparc and Ultrasparc2</entry>
-          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc3</entry>
-          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
-
Index: OK/cross-tools/sparc64-64/variables.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc64/variables.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/sparc64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/sparc64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,6 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
Index: OK/cross-tools/sparc64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64/flags.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <title>Build Flags</title>
-  <?dbhtml filename="flags.html"?>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linkers. You can choose the appropriate BUILD32 and BUILD64
-  from the table at the bottom of the page.</para>
-
-<screen os="b"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
-export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
-export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-   href="../multilib/flags.xml"
-   xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-export GCCTARGET="${GCCTARGET}"
-EOF</userinput></screen>
-
-  <para os="e">The following table gives the entires for different Sparc 64 capable
-  processors. Pick the processor that matches your system. Note: GCC settings are
-  only needed in the early sections of the book, and will not be used in the final-system
-  builds.</para>
-
-  <table os="f">
-    <title>List of 32-Bit settings, 64-Bit Build settings, and GCC setting</title>
-    <?dbfo table-width="7in" ?>
-
-    <tgroup cols="4">
-
-      <colspec colnum="1" colwidth="1in" colname="Processor"/>
-      <colspec colnum="2" colwidth="2in" colname="Build32"/>
-      <colspec colnum="3" colwidth="2in" colname="Build64"/>
-      <colspec colnum="4" colwidth="2in" colname="GCC"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>BUILD32</entry>
-          <entry>BUILD64</entry>
-          <entry>GCCTARGET</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>Ultrasparc and Ultrasparc2</entry>
-          <entry>-m32 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc3</entry>
-          <entry>-m32 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
Index: OK/cross-tools/sparc64/variables.xml
===================================================================
--- BOOK/cross-tools/sparc64/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/x86-chapter.xml
===================================================================
--- BOOK/cross-tools/x86-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/x86-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,5 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
Index: OK/cross-tools/x86/variables.xml
===================================================================
--- BOOK/cross-tools/x86/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-  <para os="a">During the building of the cross-compile tools you will need to
-  set a few variables that will be dependent on your particular needs.
-  The first variable will be the triplet of the host machine, which will be
-  put into the <envar>CLFS_HOST</envar> variable. To account for the
-  possibility that the host and target are the same arch, as cross-compiling
-  won't work when host and target are the same, part of the triplet needs to
-  be changed slightly to add "cross". Set <envar>CLFS_HOST</envar> using the
-  following command:</para>
-
-<screen os="b"><userinput>export CLFS_HOST=$(echo ${MACHTYPE} | sed -e 's/-[^-]*/-cross/')</userinput></screen>
-
-  <para os="c">Now you will need to set the triplet for the target
-  architecture. Set the target variable using the following command:</para>
-
-<screen os="d"><userinput>export CLFS_TARGET="[target triplet]"</userinput></screen>
-
-  <para os="t1">Replace [target triplet] with the appropriate machine triplet
-  using the table at the bottom of the page.</para>
-
-  <bridgehead renderas="sect4">Copy settings to the Environment</bridgehead>
-
-  <para os="e">Now add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
-
-<screen os="f"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export CLFS_HOST="${CLFS_HOST}"
-export CLFS_TARGET="${CLFS_TARGET}"
-EOF</userinput></screen>
-
-  <table os="g">
-    <title>Processor Type and  Target Triplets</title>
-    <?dbfo table-width="5in" ?>
-
-    <tgroup cols="2">
-
-      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
-      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>Target Triplet</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>386 Compatibles</entry>
-          <entry>Not Supported By Glibc</entry>
-        </row>
-        <row>
-          <entry>486 Compatibles</entry>
-          <entry>i486-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Pentium, K6, 586 Compatibles</entry>
-          <entry>i586-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Pentium II, Pentium III, Pentium 4</entry>
-          <entry>i686-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Athlon, Duron</entry>
-          <entry>i686-pc-linux-gnu</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
Index: BOOK/cross-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-64-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/x86_64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,6 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
Index: OK/cross-tools/x86_64-64/variables.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/cross-tools/x86_64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/cross-tools/x86_64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -13,6 +13,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
Index: OK/cross-tools/x86_64/variables.xml
===================================================================
--- BOOK/cross-tools/x86_64/variables.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
-
-  <para os="m1">Now set the target triplet for 32 bits:</para>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
-export CLFS_HOST="${CLFS_HOST}"
-export CLFS_TARGET="${CLFS_TARGET}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-EOF</userinput></screen>
-
-</sect1>
Index: OK/final-preps/aboutclfs.xml
===================================================================
--- BOOK/final-preps/aboutclfs.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-aboutclfs">
-  <?dbhtml filename="aboutclfs.html"?>
-
-  <title>About ${CLFS}</title>
-
-  <para>Throughout this book, the environment variable <envar>CLFS</envar> will
-  be used several times. It is paramount that this variable is always defined.
-  It should be set to the mount point chosen for the CLFS partition.
-  Check that the <envar>CLFS</envar> variable is set up properly with:</para>
-
-<screen><userinput>echo ${CLFS}</userinput></screen>
-
-  <para>Make sure the output shows the path to the CLFS partition's mount
-  point, which is <filename class="directory">/mnt/clfs</filename> if the
-  provided example was followed. If the output is incorrect, the
-  variable can be set with:</para>
-
-<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
-
-  <para>Having this variable set is beneficial in that commands such as
-  <command>install -dv ${CLFS}/tools</command> can be typed literally. The shell
-  will automatically replace <quote>${CLFS}</quote> with
-  <quote>/mnt/clfs</quote> (or whatever the variable was set to) when it
-  processes the command line.</para>
-
-  <para>If you haven't created the <filename class="directory">${CLFS}</filename>
-  directory, do so at this time by issuing the following commands:</para>
-
-<screen><userinput>install -dv ${CLFS}</userinput></screen>
-
-  <para>Do not forget to check that <envar>${CLFS}</envar> is set whenever
-  you leave and reenter the current working environment (as when doing a
-  <quote>su</quote> to <systemitem class="username">root</systemitem> or
-  another user).</para>
-
-</sect1>
Index: OK/final-preps/abouttestsuites.xml
===================================================================
--- BOOK/final-preps/abouttestsuites.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-abouttestsuites">
-  <?dbhtml filename="abouttestsuites.html"?>
-
-  <title>About the Test Suites</title>
-
-  <para>Most packages provide a test suite, usually a script or
-  <command>make</command> target, which tests the just-compiled programs or
-  libraries by executing or linking to them. Test suites are often useful
-  for verifying that a package compiled correctly. However, they cannot
-  be run while cross-compiling so we will not mention test suite commands
-  for any packages until <xref linkend="chapter-building-system"/>.</para>
-
-</sect1>
Index: OK/final-preps/addinguser.xml
===================================================================
--- BOOK/final-preps/addinguser.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-addinguser">
-  <?dbhtml filename="addinguser.html"?>
-
-  <title>Adding the CLFS User</title>
-
-  <para>When logged in as user <systemitem class="username">root</systemitem>,
-  making a single mistake can damage or destroy a system. Therefore, we
-  recommend building the packages as an unprivileged user.
-  You could use your own user name, but to make it easier to set up a clean
-  work environment, create a new user called <systemitem
-  class="username">clfs</systemitem> as a member of a new group (also named
-  <systemitem class="groupname">clfs</systemitem>) and use this user during
-  the installation process. As <systemitem class="username">root</systemitem>,
-  issue the following commands to add the new user:</para>
-
-<screen><userinput>groupadd clfs
-useradd -s /bin/bash -g clfs -d /home/clfs clfs
-mkdir -pv /home/clfs
-chown -v clfs:clfs /home/clfs</userinput></screen>
-
-  <variablelist>
-    <title>The meaning of the command line options:</title>
-
-    <varlistentry>
-      <term><parameter>-s /bin/bash</parameter></term>
-      <listitem>
-        <para>This makes <command>bash</command> the default shell for
-        user <systemitem class="username">clfs</systemitem>.</para>
-
-        <important>
-          <para>The build instructions assume that the <command>bash</command>
-          shell is in use.</para>
-        </important>
-
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>-g clfs</parameter></term>
-      <listitem>
-        <para>This option adds user <systemitem class="username">clfs</systemitem>
-        to group <systemitem class="groupname">clfs</systemitem>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>clfs</parameter></term>
-      <listitem>
-        <para>This is the actual name for the created group and user.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para>To log in as <systemitem class="username">clfs</systemitem> (as
-  opposed to switching to user <systemitem class="username">clfs</systemitem>
-  when logged in as <systemitem class="username">root</systemitem>, which
-  does not require the <systemitem class="username">clfs</systemitem> user
-  to have a password), give <systemitem class="username">clfs</systemitem>
-  a password:</para>
-
-<screen><userinput>passwd clfs</userinput></screen>
-
-  <para>Grant <systemitem class="username">clfs</systemitem> full access to
-  <filename class="directory">${CLFS}/cross-tools</filename> and
-  <filename class="directory">${CLFS}/tools</filename> by making <systemitem
-  class="username">clfs</systemitem> the directorys' owner:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}/tools
-chown -v clfs ${CLFS}/cross-tools</userinput></screen>
-
-  <para>If a separate working directory was created as suggested,
-  give user <systemitem class="username">clfs</systemitem> ownership of this directory:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}/sources</userinput></screen>
-
-  <para>Next, login as user <systemitem class="username">clfs</systemitem>.
-  This can be done via a virtual console, through a display manager, or
-  with the following substitute user command:</para>
-
-<screen><userinput>su - clfs</userinput></screen>
-
-  <para>The <quote><parameter>-</parameter></quote> instructs
-  <command>su</command> to start a login shell as opposed to a non-login
-  shell. The difference between these two types of shells can be found
-  in detail in <filename>bash(1)</filename> and <command>info
-  bash</command>.</para>
-
-  <note>
-    <para>Until specified otherwise, all commands from this point on
-    should be done as the <systemitem class="username">clfs</systemitem>
-    user.</para>
-  </note>
-
-</sect1>
Index: OK/final-preps/chapter.xml
===================================================================
--- BOOK/final-preps/chapter.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
-
-</chapter>
Index: BOOK/final-preps/common/aboutclfs.xml
===================================================================
--- BOOK/final-preps/common/aboutclfs.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/common/aboutclfs.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-final-preps-aboutclfs">
+  <?dbhtml filename="aboutclfs.html"?>
+
+  <title>About ${CLFS}</title>
+
+  <para>Throughout this book, the environment variable <envar>CLFS</envar> will
+  be used several times. It is paramount that this variable is always defined.
+  It should be set to the mount point chosen for the CLFS partition.
+  Check that the <envar>CLFS</envar> variable is set up properly with:</para>
+
+<screen><userinput>echo ${CLFS}</userinput></screen>
+
+  <para>Make sure the output shows the path to the CLFS partition's mount
+  point, which is <filename class="directory">/mnt/clfs</filename> if the
+  provided example was followed. If the output is incorrect, the
+  variable can be set with:</para>
+
+<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
+
+  <para>Having this variable set is beneficial in that commands such as
+  <command>install -dv ${CLFS}/tools</command> can be typed literally. The shell
+  will automatically replace <quote>${CLFS}</quote> with
+  <quote>/mnt/clfs</quote> (or whatever the variable was set to) when it
+  processes the command line.</para>
+
+  <para>If you haven't created the <filename class="directory">${CLFS}</filename>
+  directory, do so at this time by issuing the following commands:</para>
+
+<screen><userinput>install -dv ${CLFS}</userinput></screen>
+
+  <para>Do not forget to check that <envar>${CLFS}</envar> is set whenever
+  you leave and reenter the current working environment (as when doing a
+  <quote>su</quote> to <systemitem class="username">root</systemitem> or
+  another user).</para>
+
+</sect1>
Index: BOOK/final-preps/common/abouttestsuites.xml
===================================================================
--- BOOK/final-preps/common/abouttestsuites.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/common/abouttestsuites.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-final-preps-abouttestsuites">
+  <?dbhtml filename="abouttestsuites.html"?>
+
+  <title>About the Test Suites</title>
+
+  <para>Most packages provide a test suite, usually a script or
+  <command>make</command> target, which tests the just-compiled programs or
+  libraries by executing or linking to them. Test suites are often useful
+  for verifying that a package compiled correctly. However, they cannot
+  be run while cross-compiling so we will not mention test suite commands
+  for any packages until <xref linkend="chapter-building-system"/>.</para>
+
+</sect1>
Index: BOOK/final-preps/common/addinguser.xml
===================================================================
--- BOOK/final-preps/common/addinguser.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/common/addinguser.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-final-preps-addinguser">
+  <?dbhtml filename="addinguser.html"?>
+
+  <title>Adding the CLFS User</title>
+
+  <para>When logged in as user <systemitem class="username">root</systemitem>,
+  making a single mistake can damage or destroy a system. Therefore, we
+  recommend building the packages as an unprivileged user.
+  You could use your own user name, but to make it easier to set up a clean
+  work environment, create a new user called <systemitem
+  class="username">clfs</systemitem> as a member of a new group (also named
+  <systemitem class="groupname">clfs</systemitem>) and use this user during
+  the installation process. As <systemitem class="username">root</systemitem>,
+  issue the following commands to add the new user:</para>
+
+<screen><userinput>groupadd clfs
+useradd -s /bin/bash -g clfs -d /home/clfs clfs
+mkdir -pv /home/clfs
+chown -v clfs:clfs /home/clfs</userinput></screen>
+
+  <variablelist>
+    <title>The meaning of the command line options:</title>
+
+    <varlistentry>
+      <term><parameter>-s /bin/bash</parameter></term>
+      <listitem>
+        <para>This makes <command>bash</command> the default shell for
+        user <systemitem class="username">clfs</systemitem>.</para>
+
+        <important>
+          <para>The build instructions assume that the <command>bash</command>
+          shell is in use.</para>
+        </important>
+
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>-g clfs</parameter></term>
+      <listitem>
+        <para>This option adds user <systemitem class="username">clfs</systemitem>
+        to group <systemitem class="groupname">clfs</systemitem>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><parameter>clfs</parameter></term>
+      <listitem>
+        <para>This is the actual name for the created group and user.</para>
+      </listitem>
+    </varlistentry>
+
+  </variablelist>
+
+  <para>To log in as <systemitem class="username">clfs</systemitem> (as
+  opposed to switching to user <systemitem class="username">clfs</systemitem>
+  when logged in as <systemitem class="username">root</systemitem>, which
+  does not require the <systemitem class="username">clfs</systemitem> user
+  to have a password), give <systemitem class="username">clfs</systemitem>
+  a password:</para>
+
+<screen><userinput>passwd clfs</userinput></screen>
+
+  <para>Grant <systemitem class="username">clfs</systemitem> full access to
+  <filename class="directory">${CLFS}/cross-tools</filename> and
+  <filename class="directory">${CLFS}/tools</filename> by making <systemitem
+  class="username">clfs</systemitem> the directorys' owner:</para>
+
+<screen><userinput>chown -v clfs ${CLFS}/tools
+chown -v clfs ${CLFS}/cross-tools</userinput></screen>
+
+  <para>If a separate working directory was created as suggested,
+  give user <systemitem class="username">clfs</systemitem> ownership of this directory:</para>
+
+<screen><userinput>chown -v clfs ${CLFS}/sources</userinput></screen>
+
+  <para>Next, login as user <systemitem class="username">clfs</systemitem>.
+  This can be done via a virtual console, through a display manager, or
+  with the following substitute user command:</para>
+
+<screen><userinput>su - clfs</userinput></screen>
+
+  <para>The <quote><parameter>-</parameter></quote> instructs
+  <command>su</command> to start a login shell as opposed to a non-login
+  shell. The difference between these two types of shells can be found
+  in detail in <filename>bash(1)</filename> and <command>info
+  bash</command>.</para>
+
+  <note>
+    <para>Until specified otherwise, all commands from this point on
+    should be done as the <systemitem class="username">clfs</systemitem>
+    user.</para>
+  </note>
+
+</sect1>
Index: BOOK/final-preps/common/creatingcrossdir.xml
===================================================================
--- BOOK/final-preps/common/creatingcrossdir.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/common/creatingcrossdir.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-final-preps-creatingcrossdir">
+  <?dbhtml filename="creatingcrossdir.html"?>
+
+  <title>Creating the ${CLFS}/cross-tools Directory</title>
+
+  <para>The cross-binutils and cross-compiler built in
+  <xref linkend="chapter-cross-tools"/> will be installed under
+  <filename class="directory">${CLFS}/cross-tools</filename> to keep them
+  separate from the host programs. The programs compiled here are
+  cross-tools and will not be a part of the final CLFS system or the
+  temp-system. By keeping these programs in a separate directory, they
+  can easily be discarded later after their use.</para>
+
+  <para>Create the required directory by running the following as
+  <systemitem class="username">root</systemitem>:</para>
+
+<screen><userinput>install -dv ${CLFS}/cross-tools</userinput></screen>
+
+  <para>The next step is to create a <filename
+  class="symlink">/cross-tools</filename> symlink on the host system.
+  This will point to the newly-created directory on the CLFS partition.
+  Run this command as  <systemitem class="username">root</systemitem> as well:</para>
+
+<screen><userinput>ln -sv ${CLFS}/cross-tools /</userinput></screen>
+
+</sect1>
Index: BOOK/final-preps/common/creatingtoolsdir.xml
===================================================================
--- BOOK/final-preps/common/creatingtoolsdir.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/common/creatingtoolsdir.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-final-preps-creatingtoolsdir">
+  <?dbhtml filename="creatingtoolsdir.html"?>
+
+  <title>Creating the ${CLFS}/tools Directory</title>
+
+  <para>All programs compiled in <xref linkend="chapter-temp-system"/>
+  will be installed under <filename class="directory">${CLFS}/tools</filename>
+  to keep them separate from the programs compiled in <xref
+  linkend="chapter-building-system"/>. The programs compiled here are
+  temporary tools and will not be a part of the final CLFS system. By keeping
+  these programs in a separate directory, they can easily be discarded later
+  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-temp-system"/>).</para>
+
+  <para>Create the required directory by running the following as
+  <systemitem class="username">root</systemitem>:</para>
+
+<screen><userinput>install -dv ${CLFS}/tools</userinput></screen>
+
+  <para>The next step is to create a <filename class="symlink">/tools</filename>
+  symlink on the host system. This will point to the newly-created directory
+  on the CLFS partition. Run this command as <systemitem
+  class="username">root</systemitem> as well:</para>
+
+<screen><userinput>ln -sv ${CLFS}/tools /</userinput></screen>
+
+  <note>
+    <para>The above command is correct. The <command>ln</command> command
+    has a few syntactic variations, so be sure to check <command>info
+    coreutils ln</command> and <filename>ln(1)</filename> before reporting
+    what you may think is an error.</para>
+  </note>
+
+  <para>The created symlink enables the toolchain to be compiled so that
+  it always refers to <filename class="directory">/tools</filename>,
+  meaning that the compiler, assembler, and linker will work. This will
+  provide a common place for our temporary tools system.</para>
+
+</sect1>
Index: BOOK/final-preps/common/settingenviron.xml
===================================================================
--- BOOK/final-preps/common/settingenviron.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/common/settingenviron.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-final-preps-settingenviron">
+  <?dbhtml filename="settingenvironment.html"?>
+
+  <title>Setting Up the Environment</title>
+
+  <para os="a">Set up a good working environment by creating two new startup
+  files for the <command>bash</command> shell. While logged in as user
+  <systemitem class="username">clfs</systemitem>, issue the following
+  command to create a new <filename>.bash_profile</filename>:</para>
+
+<screen os="b"><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
+<literal>exec env -i HOME=${HOME} TERM=${TERM} PS1='\u:\w\$ ' /bin/bash</literal>
+EOF</userinput></screen>
+
+  <para os="c">When logged on as user <systemitem class="username">clfs</systemitem>,
+  the initial shell is usually a <emphasis>login</emphasis> shell which
+  reads the <filename>/etc/profile</filename> of the host (probably
+  containing some settings and environment variables) and then
+  <filename>.bash_profile</filename>. The
+  <command>exec env -i.../bin/bash</command> command in the
+  <filename>.bash_profile</filename> file replaces the running shell with
+  a new one with a completely empty environment, except for the
+  <envar>HOME</envar>, <envar>TERM</envar>, and <envar>PS1</envar> variables.
+  This ensures that no unwanted and potentially hazardous environment
+  variables from the host system leak into the build environment. The
+  technique used here achieves the goal of ensuring a clean environment.</para>
+
+  <para os="d">The new instance of the shell is a <emphasis>non-login</emphasis>
+  shell, which does not read the <filename>/etc/profile</filename> or
+  <filename>.bash_profile</filename> files, but rather reads the
+  <filename>.bashrc</filename> file instead. Create the
+  <filename>.bashrc</filename> file now:</para>
+
+<screen os="e"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
+<literal>set +h
+umask 022
+CLFS=/mnt/clfs
+LC_ALL=POSIX
+PATH=/cross-tools/bin:/bin:/usr/bin
+export CLFS LC_ALL PATH
+unset CFLAGS
+unset CXXFLAGS</literal>
+EOF</userinput></screen>
+
+  <para os="f">The <command>set +h</command> command turns off
+  <command>bash</command>'s hash function. Hashing is ordinarily a useful
+  feature&mdash;<command>bash</command> uses a hash table to remember the
+  full path of executable files to avoid searching the <envar>PATH</envar>
+  time and again to find the same executable. However, the new tools should
+  be used as soon as they are installed. By switching off the hash function,
+  the shell will always search the <envar>PATH</envar> when a program is to
+  be run. As such, the shell will find the newly compiled tools in
+  <filename class="directory">/cross-tools</filename> as soon as they are
+  available without remembering a previous version of the same program in a
+  different location.</para>
+
+  <para os="g">Setting the user file-creation mask (umask) to 022 ensures that
+  newly created files and directories are only writable by their owner,
+  but are readable and executable by anyone (assuming default modes are
+  used by the open(2) system call, new files will end up with permission
+  mode 644 and directories with mode 755).</para>
+
+  <para os="h">The <envar>CLFS</envar> variable should be set to the
+  chosen mount point.</para>
+
+  <para os="i">The <envar>LC_ALL</envar> variable controls the localization
+  of certain programs, making their messages follow the conventions of a
+  specified country.  If the host system uses a version of Glibc older
+  than 2.2.4, having <envar>LC_ALL</envar> set to something other than
+  <quote>POSIX</quote> or <quote>C</quote> (during this chapter) may cause
+  issues if you exit the chroot environment and wish to return later.
+  Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
+  (the two are equivalent) ensures that everything will work as expected in
+  the chroot environment.</para>
+
+  <para os="j">By putting <filename class="directory">/cross-tools/bin</filename>
+  at the beginning of the <envar>PATH</envar>, the cross-compiler
+  built in <xref linkend="chapter-cross-tools"/> will be picked up by
+  the build process for the temp-system packages before anything that
+  may be installed on the host. This, combined with turning off
+  hashing, helps to ensure that you will be using the cross-compile
+  tools to build the temp-system in /tools.</para>
+
+  <para os="k">The <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> should
+  not be set while building the temporary system, so we unset them.</para>
+
+  <para os="l">Finally, to have the environment fully prepared for building the
+  temporary tools, source the just-created user profile:</para>
+
+<screen os="m"><userinput>source ~/.bash_profile</userinput></screen>
+
+</sect1>
Index: OK/final-preps/creatingcrossdir.xml
===================================================================
--- BOOK/final-preps/creatingcrossdir.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-creatingcrossdir">
-  <?dbhtml filename="creatingcrossdir.html"?>
-
-  <title>Creating the ${CLFS}/cross-tools Directory</title>
-
-  <para>The cross-binutils and cross-compiler built in
-  <xref linkend="chapter-cross-tools"/> will be installed under
-  <filename class="directory">${CLFS}/cross-tools</filename> to keep them
-  separate from the host programs. The programs compiled here are
-  cross-tools and will not be a part of the final CLFS system or the
-  temp-system. By keeping these programs in a separate directory, they
-  can easily be discarded later after their use.</para>
-
-  <para>Create the required directory by running the following as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen><userinput>install -dv ${CLFS}/cross-tools</userinput></screen>
-
-  <para>The next step is to create a <filename
-  class="symlink">/cross-tools</filename> symlink on the host system.
-  This will point to the newly-created directory on the CLFS partition.
-  Run this command as  <systemitem class="username">root</systemitem> as well:</para>
-
-<screen><userinput>ln -sv ${CLFS}/cross-tools /</userinput></screen>
-
-</sect1>
Index: OK/final-preps/creatingtoolsdir.xml
===================================================================
--- BOOK/final-preps/creatingtoolsdir.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-creatingtoolsdir">
-  <?dbhtml filename="creatingtoolsdir.html"?>
-
-  <title>Creating the ${CLFS}/tools Directory</title>
-
-  <para>All programs compiled in <xref linkend="chapter-temp-system"/>
-  will be installed under <filename class="directory">${CLFS}/tools</filename>
-  to keep them separate from the programs compiled in <xref
-  linkend="chapter-building-system"/>. The programs compiled here are
-  temporary tools and will not be a part of the final CLFS system. By keeping
-  these programs in a separate directory, they can easily be discarded later
-  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-temp-system"/>).</para>
-
-  <para>Create the required directory by running the following as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen><userinput>install -dv ${CLFS}/tools</userinput></screen>
-
-  <para>The next step is to create a <filename class="symlink">/tools</filename>
-  symlink on the host system. This will point to the newly-created directory
-  on the CLFS partition. Run this command as <systemitem
-  class="username">root</systemitem> as well:</para>
-
-<screen><userinput>ln -sv ${CLFS}/tools /</userinput></screen>
-
-  <note>
-    <para>The above command is correct. The <command>ln</command> command
-    has a few syntactic variations, so be sure to check <command>info
-    coreutils ln</command> and <filename>ln(1)</filename> before reporting
-    what you may think is an error.</para>
-  </note>
-
-  <para>The created symlink enables the toolchain to be compiled so that
-  it always refers to <filename class="directory">/tools</filename>,
-  meaning that the compiler, assembler, and linker will work. This will
-  provide a common place for our temporary tools system.</para>
-
-</sect1>
Index: BOOK/final-preps/mips-chapter.xml
===================================================================
--- BOOK/final-preps/mips-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/mips-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/mips/variables.xml
===================================================================
--- BOOK/final-preps/mips/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/mips/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <para os="aa">For a MIPS Little Endian Machine:</para>
+
+<screen os="ab"><userinput>export CLFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
+
+    <para os="ac">For a MIPS Big Endian Machine:</para>
+
+<screen os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>
Index: BOOK/final-preps/mips64-64-chapter.xml
===================================================================
--- BOOK/final-preps/mips64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/mips64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/mips64-64/variables.xml
===================================================================
--- BOOK/final-preps/mips64-64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/mips64-64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips64/variables.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips64/variables.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/variables.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD64="-mabi=64"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/variables.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/variables.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+</sect1>
Index: BOOK/final-preps/mips64-chapter.xml
===================================================================
--- BOOK/final-preps/mips64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/mips64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/mips64/variables.xml
===================================================================
--- BOOK/final-preps/mips64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/mips64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+<screen os="ab"><userinput>export CLFS_TARGET="mips64el-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/variables.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+<screen os="ad"><userinput>export CLFS_TARGET="mips64-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD32="-mabi=32"
+export BUILDN32="-mabi=n32"
+export BUILD64="-mabi=64"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+export BUILD32="${BUILD32}"
+export BUILDN32="${BUILDN32}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
+
+</sect1>
Index: BOOK/final-preps/ppc-chapter.xml
===================================================================
--- BOOK/final-preps/ppc-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/ppc-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/ppc/variables.xml
===================================================================
--- BOOK/final-preps/ppc/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/ppc/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>
Index: BOOK/final-preps/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-preps/ppc64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/ppc64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/ppc64-64/variables.xml
===================================================================
--- BOOK/final-preps/ppc64-64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/ppc64-64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/variables.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/variables.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/variables.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/variables.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+</sect1>
Index: BOOK/final-preps/ppc64-chapter.xml
===================================================================
--- BOOK/final-preps/ppc64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/ppc64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/ppc64/variables.xml
===================================================================
--- BOOK/final-preps/ppc64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/ppc64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+</sect1>
Index: OK/final-preps/settingenviron.xml
===================================================================
--- BOOK/final-preps/settingenviron.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-settingenviron">
-  <?dbhtml filename="settingenvironment.html"?>
-
-  <title>Setting Up the Environment</title>
-
-  <para os="a">Set up a good working environment by creating two new startup
-  files for the <command>bash</command> shell. While logged in as user
-  <systemitem class="username">clfs</systemitem>, issue the following
-  command to create a new <filename>.bash_profile</filename>:</para>
-
-<screen os="b"><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
-<literal>exec env -i HOME=${HOME} TERM=${TERM} PS1='\u:\w\$ ' /bin/bash</literal>
-EOF</userinput></screen>
-
-  <para os="c">When logged on as user <systemitem class="username">clfs</systemitem>,
-  the initial shell is usually a <emphasis>login</emphasis> shell which
-  reads the <filename>/etc/profile</filename> of the host (probably
-  containing some settings and environment variables) and then
-  <filename>.bash_profile</filename>. The
-  <command>exec env -i.../bin/bash</command> command in the
-  <filename>.bash_profile</filename> file replaces the running shell with
-  a new one with a completely empty environment, except for the
-  <envar>HOME</envar>, <envar>TERM</envar>, and <envar>PS1</envar> variables.
-  This ensures that no unwanted and potentially hazardous environment
-  variables from the host system leak into the build environment. The
-  technique used here achieves the goal of ensuring a clean environment.</para>
-
-  <para os="d">The new instance of the shell is a <emphasis>non-login</emphasis>
-  shell, which does not read the <filename>/etc/profile</filename> or
-  <filename>.bash_profile</filename> files, but rather reads the
-  <filename>.bashrc</filename> file instead. Create the
-  <filename>.bashrc</filename> file now:</para>
-
-<screen os="e"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
-<literal>set +h
-umask 022
-CLFS=/mnt/clfs
-LC_ALL=POSIX
-PATH=/cross-tools/bin:/bin:/usr/bin
-export CLFS LC_ALL PATH
-unset CFLAGS
-unset CXXFLAGS</literal>
-EOF</userinput></screen>
-
-  <para os="f">The <command>set +h</command> command turns off
-  <command>bash</command>'s hash function. Hashing is ordinarily a useful
-  feature&mdash;<command>bash</command> uses a hash table to remember the
-  full path of executable files to avoid searching the <envar>PATH</envar>
-  time and again to find the same executable. However, the new tools should
-  be used as soon as they are installed. By switching off the hash function,
-  the shell will always search the <envar>PATH</envar> when a program is to
-  be run. As such, the shell will find the newly compiled tools in
-  <filename class="directory">/cross-tools</filename> as soon as they are
-  available without remembering a previous version of the same program in a
-  different location.</para>
-
-  <para os="g">Setting the user file-creation mask (umask) to 022 ensures that
-  newly created files and directories are only writable by their owner,
-  but are readable and executable by anyone (assuming default modes are
-  used by the open(2) system call, new files will end up with permission
-  mode 644 and directories with mode 755).</para>
-
-  <para os="h">The <envar>CLFS</envar> variable should be set to the
-  chosen mount point.</para>
-
-  <para os="i">The <envar>LC_ALL</envar> variable controls the localization
-  of certain programs, making their messages follow the conventions of a
-  specified country.  If the host system uses a version of Glibc older
-  than 2.2.4, having <envar>LC_ALL</envar> set to something other than
-  <quote>POSIX</quote> or <quote>C</quote> (during this chapter) may cause
-  issues if you exit the chroot environment and wish to return later.
-  Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
-  (the two are equivalent) ensures that everything will work as expected in
-  the chroot environment.</para>
-
-  <para os="j">By putting <filename class="directory">/cross-tools/bin</filename>
-  at the beginning of the <envar>PATH</envar>, the cross-compiler
-  built in <xref linkend="chapter-cross-tools"/> will be picked up by
-  the build process for the temp-system packages before anything that
-  may be installed on the host. This, combined with turning off
-  hashing, helps to ensure that you will be using the cross-compile
-  tools to build the temp-system in /tools.</para>
-
-  <para os="k">The <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> should
-  not be set while building the temporary system, so we unset them.</para>
-
-  <para os="l">Finally, to have the environment fully prepared for building the
-  temporary tools, source the just-created user profile:</para>
-
-<screen os="m"><userinput>source ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: BOOK/final-preps/sparc-chapter.xml
===================================================================
--- BOOK/final-preps/sparc-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/sparc-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/sparc/variables.xml
===================================================================
--- BOOK/final-preps/sparc/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/sparc/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+</sect1>
Index: BOOK/final-preps/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-preps/sparc64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/sparc64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/sparc64-64/variables.xml
===================================================================
--- BOOK/final-preps/sparc64-64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/sparc64-64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../sparc64/variables.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+  <para os="g">We will need to setup target specific flags for the compiler
+  and linkers. You can choose the appropriate BUILD64 and GCCTARGET
+  from the table at the bottom of the page.</para>
+
+<screen os="h"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
+export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/variables.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export BUILD64="${BUILD64}"
+export GCCTARGET="${GCCTARGET}"
+EOF</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../sparc64/variables.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+  <table os="l">
+    <title>List of architectures, target triplets, and recommended book</title>
+    <?dbfo table-width="7in" ?>
+
+    <tgroup cols="3">
+
+      <colspec colnum="1" colwidth="1in"   colname="Processor"/>
+      <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
+      <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
+
+      <thead>
+        <row>
+          <entry>Processor</entry>
+          <entry>BUILD64</entry>
+          <entry>GCCTARGET</entry>
+        </row>
+      </thead>
+
+      <tbody>
+        <row>
+          <entry>Ultrasparc and Ultrasparc2</entry>
+          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
+          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
+        </row>
+        <row>
+          <entry>Ultrasparc3</entry>
+          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+        </row>
+      </tbody>
+
+    </tgroup>
+
+  </table>
+
+</sect1>
Index: BOOK/final-preps/sparc64-chapter.xml
===================================================================
--- BOOK/final-preps/sparc64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/sparc64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/sparc64/variables.xml
===================================================================
--- BOOK/final-preps/sparc64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/sparc64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+
+  <para os="g">We will need to setup target specific flags for the compiler
+  and linkers. You can choose the appropriate BUILD32, BUILD64, and GCCTARGET
+  from the table at the bottom of the page.</para>
+
+<screen os="h"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
+export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
+export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+export GCCTARGET="${GCCTARGET}"
+EOF</userinput></screen>
+
+  <para os="k">The following table gives the entries for different Sparc 64 capable
+  processors. Pick the processor that matches your system. Note: GCC settings are
+  only needed in the early sections of the book, and will not be used in the final-system
+  builds.</para>
+
+  <table os="l">
+    <title>List of 32-Bit settings, 64-Bit Build settings, and GCC setting</title>
+    <?dbfo table-width="7in" ?>
+
+    <tgroup cols="4">
+
+      <colspec colnum="1" colwidth="1in" colname="Processor"/>
+      <colspec colnum="2" colwidth="2in" colname="Build32"/>
+      <colspec colnum="3" colwidth="2in" colname="Build64"/>
+      <colspec colnum="4" colwidth="2in" colname="GCC"/>
+
+      <thead>
+        <row>
+          <entry>Processor</entry>
+          <entry>BUILD32</entry>
+          <entry>BUILD64</entry>
+          <entry>GCCTARGET</entry>
+        </row>
+      </thead>
+
+      <tbody>
+        <row>
+          <entry>Ultrasparc and Ultrasparc2</entry>
+          <entry>-m32 -mcpu=ultrasparc -mtune=ultrasparc</entry>
+          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
+          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
+        </row>
+        <row>
+          <entry>Ultrasparc3</entry>
+          <entry>-m32 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+        </row>
+      </tbody>
+
+    </tgroup>
+
+  </table>
+
+</sect1>
Index: BOOK/final-preps/x86-chapter.xml
===================================================================
--- BOOK/final-preps/x86-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/x86-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/x86/variables.xml
===================================================================
--- BOOK/final-preps/x86/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/x86/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+  <para os="a">During the building of the cross-compile tools you will need to
+  set a few variables that will be dependent on your particular needs.
+  The first variable will be the triplet of the host machine, which will be
+  put into the <envar>CLFS_HOST</envar> variable. To account for the
+  possibility that the host and target are the same arch, as cross-compiling
+  won't work when host and target are the same, part of the triplet needs to
+  be changed slightly to add "cross". Set <envar>CLFS_HOST</envar> using the
+  following command:</para>
+
+<screen os="b"><userinput>export CLFS_HOST=$(echo ${MACHTYPE} | sed -e 's/-[^-]*/-cross/')</userinput></screen>
+
+  <para os="c">Now you will need to set the triplet for the target
+  architecture. Set the target variable using the following command:</para>
+
+<screen os="d"><userinput>export CLFS_TARGET="[target triplet]"</userinput></screen>
+
+  <para os="t1">Replace [target triplet] with the appropriate machine triplet
+  using the table at the bottom of the page.</para>
+
+  <bridgehead renderas="sect4">Copy settings to the Environment</bridgehead>
+
+  <para os="e">Now add these to <filename>~/.bashrc</filename>, just in
+  case you have to exit and restart building later:</para>
+
+<screen os="f"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+EOF</userinput></screen>
+
+  <table os="g">
+    <title>Processor Type and  Target Triplets</title>
+    <?dbfo table-width="5in" ?>
+
+    <tgroup cols="2">
+
+      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
+      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
+
+      <thead>
+        <row>
+          <entry>Processor</entry>
+          <entry>Target Triplet</entry>
+        </row>
+      </thead>
+
+      <tbody>
+        <row>
+          <entry>386 Compatibles</entry>
+          <entry>Not Supported By Glibc</entry>
+        </row>
+        <row>
+          <entry>486 Compatibles</entry>
+          <entry>i486-pc-linux-gnu</entry>
+        </row>
+        <row>
+          <entry>Pentium, K6, 586 Compatibles</entry>
+          <entry>i586-pc-linux-gnu</entry>
+        </row>
+        <row>
+          <entry>Pentium II, Pentium III, Pentium 4</entry>
+          <entry>i686-pc-linux-gnu</entry>
+        </row>
+        <row>
+          <entry>Athlon, Duron</entry>
+          <entry>i686-pc-linux-gnu</entry>
+        </row>
+      </tbody>
+
+    </tgroup>
+
+  </table>
+
+</sect1>
Index: BOOK/final-preps/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-preps/x86_64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/x86_64-64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/x86_64-64/variables.xml
===================================================================
--- BOOK/final-preps/x86_64-64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/x86_64-64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD64="-m64"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64/variables.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
+
+</sect1>
Index: BOOK/final-preps/x86_64-chapter.xml
===================================================================
--- BOOK/final-preps/x86_64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/x86_64-chapter.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<chapter id="chapter-final-preps" xreflabel="Final Preparations">
+  <?dbhtml dir="final-preps"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Final Preparations</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
+
+</chapter>
Index: BOOK/final-preps/x86_64/variables.xml
===================================================================
--- BOOK/final-preps/x86_64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
+++ BOOK/final-preps/x86_64/variables.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86/variables.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
+
+  <para os="e">Now set the target triplet for 32 bits:</para>
+
+<screen os="f"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+
+  <para os="g">We will need to setup target-specific flags for the compiler
+  and linker:</para>
+
+<screen os="h"><userinput>export BUILD32="-m32"
+export BUILD64="-m64"</userinput></screen>
+
+  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+  <para os="i">Now add the host and target variables, and compiler and linker
+  flags, to <filename>~/.bashrc</filename>, just in case you have to exit and
+  restart building later:</para>
+
+<screen os="j"><userinput>cat &gt;&gt; ~/.bashrc &lt;&lt; EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
+
+</sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/introduction/common/changelog.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -45,4 +45,9 @@
           this was done.</para>
         </listitem>
+        <listitem>
+          <para>[Chris] - Removed separate "Build flags" pages and moved that
+          info to "Build Variables" pages, and moved those from cross-tools
+          to final-preps.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: BOOK/mips-index.xml
===================================================================
--- BOOK/mips-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/mips-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips-chapter.xml"/>
 
   </part>
Index: BOOK/mips64-64-index.xml
===================================================================
--- BOOK/mips64-64-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/mips64-64-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-64-chapter.xml"/>
 
   </part>
Index: BOOK/mips64-index.xml
===================================================================
--- BOOK/mips64-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/mips64-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-chapter.xml"/>
 
   </part>
Index: BOOK/ppc-index.xml
===================================================================
--- BOOK/ppc-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/ppc-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc-chapter.xml"/>
 
   </part>
Index: BOOK/ppc64-64-index.xml
===================================================================
--- BOOK/ppc64-64-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/ppc64-64-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-64-chapter.xml"/>
 
   </part>
Index: BOOK/ppc64-index.xml
===================================================================
--- BOOK/ppc64-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/ppc64-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-chapter.xml"/>
 
   </part>
Index: BOOK/sparc-index.xml
===================================================================
--- BOOK/sparc-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/sparc-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc-chapter.xml"/>
 
   </part>
Index: BOOK/sparc64-64-index.xml
===================================================================
--- BOOK/sparc64-64-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/sparc64-64-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-64-chapter.xml"/>
 
   </part>
Index: BOOK/sparc64-index.xml
===================================================================
--- BOOK/sparc64-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/sparc64-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-chapter.xml"/>
 
   </part>
Index: BOOK/x86-index.xml
===================================================================
--- BOOK/x86-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/x86-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86-chapter.xml"/>
 
   </part>
Index: BOOK/x86_64-64-index.xml
===================================================================
--- BOOK/x86_64-64-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/x86_64-64-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-64-chapter.xml"/>
 
   </part>
Index: BOOK/x86_64-index.xml
===================================================================
--- BOOK/x86_64-index.xml	(revision 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266)
+++ BOOK/x86_64-index.xml	(revision 01817d3511d84cd093d755c629bb1dc459ab122f)
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-chapter.xml"/>
 
   </part>
