Index: BOOK/cross-tools/arm-chapter.xml
===================================================================
--- BOOK/cross-tools/arm-chapter.xml	(revision c5d3ce0df81570960a63bceafffd62359253bef7)
+++ BOOK/cross-tools/arm-chapter.xml	(revision e2ce6d78055e4c090bf21e405d1e9a2a668ab4a9)
@@ -21,4 +21,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
 
 </chapter>
Index: BOOK/cross-tools/common/toolchain.xml
===================================================================
--- BOOK/cross-tools/common/toolchain.xml	(revision e2ce6d78055e4c090bf21e405d1e9a2a668ab4a9)
+++ BOOK/cross-tools/common/toolchain.xml	(revision e2ce6d78055e4c090bf21e405d1e9a2a668ab4a9)
@@ -0,0 +1,26 @@
+<?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-system-toolchain">
+  <?dbhtml filename="toolchain.html"?>
+
+  <title>ToolChain Variables</title>
+
+  <para>Setup target-specific variables for the compiler
+  and linkers. This time we keep them:</para>
+
+<screen><userinput>echo <literal>export CC=\""${CLFS_TARGET}-gcc\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export CXX=\""${CLFS_TARGET}-g++\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export AR=\""${CLFS_TARGET}-ar\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export AS=\""${CLFS_TARGET}-as\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export LD=\""${CLFS_TARGET}-ld\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export RANLIB=\""${CLFS_TARGET}-ranlib\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export READELF=\""${CLFS_TARGET}-readelf\""</literal> &gt;&gt; ~/.bashrc
+echo <literal>export STRIP=\""${CLFS_TARGET}-strip\""</literal> &gt;&gt; ~/.bashrc
+source ~/.bashrc</userinput></screen>
+
+</sect1>
Index: BOOK/cross-tools/mips-chapter.xml
===================================================================
--- BOOK/cross-tools/mips-chapter.xml	(revision c5d3ce0df81570960a63bceafffd62359253bef7)
+++ BOOK/cross-tools/mips-chapter.xml	(revision e2ce6d78055e4c090bf21e405d1e9a2a668ab4a9)
@@ -22,4 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
 
 </chapter>
Index: BOOK/cross-tools/x86-chapter.xml
===================================================================
--- BOOK/cross-tools/x86-chapter.xml	(revision c5d3ce0df81570960a63bceafffd62359253bef7)
+++ BOOK/cross-tools/x86-chapter.xml	(revision e2ce6d78055e4c090bf21e405d1e9a2a668ab4a9)
@@ -21,4 +21,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
 
 </chapter>
Index: BOOK/final-system/chapter.xml
===================================================================
--- BOOK/final-system/chapter.xml	(revision c5d3ce0df81570960a63bceafffd62359253bef7)
+++ BOOK/final-system/chapter.xml	(revision e2ce6d78055e4c090bf21e405d1e9a2a668ab4a9)
@@ -15,5 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/busybox.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
Index: OK/final-system/common/toolchain.xml
===================================================================
--- BOOK/final-system/common/toolchain.xml	(revision c5d3ce0df81570960a63bceafffd62359253bef7)
+++ 	(revision )
@@ -1,26 +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-system-toolchain">
-  <?dbhtml filename="toolchain.html"?>
-
-  <title>ToolChain Variables</title>
-
-  <para>Setup target-specific variables for the compiler
-  and linkers. This time we keep them:</para>
-
-<screen><userinput>echo <literal>export CC=\""${CLFS_TARGET}-gcc\""</literal> &gt;&gt; ~/.bashrc
-echo <literal>export CXX=\""${CLFS_TARGET}-g++\""</literal> &gt;&gt; ~/.bashrc
-echo <literal>export AR=\""${CLFS_TARGET}-ar\""</literal> &gt;&gt; ~/.bashrc
-echo <literal>export AS=\""${CLFS_TARGET}-as\""</literal> &gt;&gt; ~/.bashrc
-echo <literal>export LD=\""${CLFS_TARGET}-ld\""</literal> &gt;&gt; ~/.bashrc
-echo <literal>export RANLIB=\""${CLFS_TARGET}-ranlib\""</literal> &gt;&gt; ~/.bashrc
-echo <literal>export READELF=\""${CLFS_TARGET}-readelf\""</literal> &gt;&gt; ~/.bashrc
-echo <literal>export STRIP=\""${CLFS_TARGET}-strip\""</literal> &gt;&gt; ~/.bashrc
-source ~/.bashrc</userinput></screen>
-
-</sect1>
