Index: OK/boot/64/e2fsprogs.xml
===================================================================
--- BOOK/boot/64/e2fsprogs.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,81 +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-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
-  ../configure --prefix=/tools --enable-elf-shlibs \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-libblkid --disable-libuuid --disable-fsck \
-    --disable-uuidd</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/64/eudev.xml
===================================================================
--- BOOK/boot/64/eudev.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,71 +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-boot-eudev" role="wrap">
-  <?dbhtml filename="eudev.html"?>
-
-  <title>Eudev-&eudev-version;</title>
-
-  <indexterm zone="ch-boot-eudev">
-    <primary sortas="a-Eudev">Eudev</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Eudev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET}  --disable-introspection --disable-gtk-doc-html \
-    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
-    --enable-libkmod</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='r1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='r2'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
-  xpointer="xpointer(//*[@role='content'])"/>
-
-</sect1>
Index: OK/boot/64/grub-build.xml
===================================================================
--- BOOK/boot/64/grub-build.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,79 +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-boot-grub-build" role="wrap">
-  <?dbhtml filename="grub-build.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-boot-grub-build">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-grub" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/64/kmod.xml
===================================================================
--- BOOK/boot/64/kmod.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,78 +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-boot-kmod" role="wrap">
-  <?dbhtml filename="kmod.html"?>
-
-  <title>Kmod-&kmod-version;</title>
-
-  <indexterm zone="ch-boot-kmod">
-    <primary sortas="a-Kmod">Kmod</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/kmod.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kmod</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kmod" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/64/shadow.xml
===================================================================
--- BOOK/boot/64/shadow.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,81 +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-boot-shadow" role="wrap">
-  <?dbhtml filename="shadow.html"?>
-
-  <title>Shadow-&shadow-version;</title>
-
-  <indexterm zone="ch-boot-shadow">
-    <primary sortas="a-Shadow">Shadow</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/shadow.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Shadow</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-shadow" role="."/></para>
-  </sect2>
-
-</sect1>
Index: OK/boot/64/sysvinit.xml
===================================================================
--- BOOK/boot/64/sysvinit.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,57 +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-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="ac"><userinput>make -C src clobber
-make -C src CC="${CC} ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='configuration'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='content'])"/>
-
-</sect1>
Index: BOOK/boot/common/eudev.xml
===================================================================
--- BOOK/boot/common/eudev.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/common/eudev.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -31,5 +31,5 @@
 <screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-introspection --disable-gtk-doc-html \
-    --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
+    --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
     --enable-libkmod</userinput></screen>
 
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/mips64-64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -15,9 +15,9 @@
   <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="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/bootloaders.xml"/>
Index: BOOK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/mips64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -17,6 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>
Index: BOOK/boot/mips64/colo-build.xml
===================================================================
--- BOOK/boot/mips64/colo-build.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/mips64/colo-build.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -58,5 +58,5 @@
 make CC=gcc
 cd ../..
-make CC="${CC} ${BUILD64}" CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
+make CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/multilib/e2fsprogs.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -41,6 +41,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
-  ../configure --prefix=/tools --enable-elf-shlibs \
+<screen os="aa"><userinput>../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \
Index: BOOK/boot/multilib/eudev.xml
===================================================================
--- BOOK/boot/multilib/eudev.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/multilib/eudev.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -26,5 +26,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
+<screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} \
     --host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
     --disable-introspection --disable-gtk-doc-html --disable-gudev \
Index: BOOK/boot/multilib/grub-build.xml
===================================================================
--- BOOK/boot/multilib/grub-build.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/multilib/grub-build.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -39,5 +39,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="ab"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64 --disable-werror \
Index: BOOK/boot/multilib/kmod.xml
===================================================================
--- BOOK/boot/multilib/kmod.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/multilib/kmod.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
Index: BOOK/boot/ppc64-64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/ppc64-64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -15,12 +15,12 @@
   <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="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/powerpc-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
Index: OK/boot/ppc64-64/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc64-64/powerpc-utils.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,56 +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-boot-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-boot-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/ppc/powerpc-utils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>${CC} ${BUILD64} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-powerpc-utils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/ppc64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/ppc64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -18,9 +18,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/hfsutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/powerpc-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/yaboot-build.xml"/>
Index: BOOK/boot/ppc64/e2fsprogs-libs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs-libs.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/ppc64/e2fsprogs-libs.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -57,5 +57,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/e2fsprogs.xml"
+    href="../multilib/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: BOOK/boot/ppc64/e2fsprogs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/ppc64/e2fsprogs.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -54,6 +54,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
-  ../configure --prefix=/tools --enable-elf-shlibs \
+<screen os="aa"><userinput>../configure --prefix=/tools --enable-elf-shlibs \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-libblkid --disable-libuuid --disable-fsck \
@@ -65,5 +64,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/e2fsprogs.xml"
+    href="../multilib/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
Index: OK/boot/ppc64/hfsutils.xml
===================================================================
--- BOOK/boot/ppc64/hfsutils.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,69 +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-boot-hfsutils" role="wrap">
-  <?dbhtml filename="hfsutils.html"?>
-
-  <title>Hfsutils-&hfsutils-version;</title>
-
-  <indexterm zone="ch-boot-hfsutils">
-    <primary sortas="a-Hfsutils">Hfsutils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/ppc/hfsutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Hfsutils</title>
-
-    <para>If you have created, or will create, the ext2 filesystem on your
-    Mac using ext2fsx you can jump ahead to
-    <xref linkend="ch-boot-yaboot-build" role="."/>. The next three packages
-    are for people who cannot do that.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-hfsutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -15,9 +15,9 @@
   <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="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/sparc64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -17,6 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/kernel.xml"/>
Index: BOOK/boot/x86/grub-build.xml
===================================================================
--- BOOK/boot/x86/grub-build.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/x86/grub-build.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -41,5 +41,5 @@
 <screen os="ab"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-werror --enable-grub-mkfont=no</userinput></screen>
+    --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
 
 <para os="b">The meaning of the new configure option:</para>
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -15,11 +15,11 @@
   <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="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/grub-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/grub-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/createfiles.xml"/>
Index: BOOK/boot/x86_64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/boot/x86_64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -17,6 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>
Index: BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- BOOK/introduction/mips64-64/changelog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/introduction/mips64-64/changelog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -33,4 +33,16 @@
 
 -->
+
+    <listitem>
+      <para>25 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>03 May 2014</para>
Index: BOOK/introduction/mips64/changelog.xml
===================================================================
--- BOOK/introduction/mips64/changelog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/introduction/mips64/changelog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -33,4 +33,16 @@
 
 -->
+
+    <listitem>
+      <para>25 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>03 May 2014</para>
Index: BOOK/introduction/ppc64-64/changelog.xml
===================================================================
--- BOOK/introduction/ppc64-64/changelog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/introduction/ppc64-64/changelog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -33,4 +33,16 @@
 
 -->
+
+    <listitem>
+      <para>25 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>03 February 2014</para>
Index: BOOK/introduction/ppc64/changelog.xml
===================================================================
--- BOOK/introduction/ppc64/changelog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/introduction/ppc64/changelog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -33,4 +33,15 @@
 
 -->
+
+    <listitem>
+      <para>25 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/introduction/sparc64-64/changelog.xml
===================================================================
--- BOOK/introduction/sparc64-64/changelog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/introduction/sparc64-64/changelog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -33,4 +33,16 @@
 
 -->
+
+    <listitem>
+      <para>25 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>24 October 2013</para>
Index: BOOK/introduction/sparc64/changelog.xml
===================================================================
--- BOOK/introduction/sparc64/changelog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/introduction/sparc64/changelog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -33,4 +33,16 @@
 
 -->
+
+    <listitem>
+      <para>25 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>08 November 2013</para>
Index: BOOK/introduction/x86_64-64/changelog.xml
===================================================================
--- BOOK/introduction/x86_64-64/changelog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/introduction/x86_64-64/changelog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -33,4 +33,16 @@
 
 -->
+
+    <listitem>
+      <para>25 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>27 April 2014</para>
Index: BOOK/introduction/x86_64/changelog.xml
===================================================================
--- BOOK/introduction/x86_64/changelog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/introduction/x86_64/changelog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -33,4 +33,16 @@
 
 -->
+
+    <listitem>
+      <para>25 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Added ${BUILD64} to variables.xml in temp-system,
+          and removed CC="${CC} ${BUILD64}" from temp-system and boot
+          packages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>27 April 2014</para>
Index: BOOK/temp-system/64/binutils.xml
===================================================================
--- BOOK/temp-system/64/binutils.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/64/binutils.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -44,5 +44,5 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
+<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
     --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --target=${CLFS_TARGET} --with-lib-path=/tools/lib --disable-nls \
Index: OK/temp-system/64/bzip2.xml
===================================================================
--- BOOK/temp-system/64/bzip2.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,57 +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-temp-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version;</title>
-
-  <indexterm zone="ch-temp-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cc"><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/check.xml
===================================================================
--- BOOK/temp-system/64/check.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,57 +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-temp-system-check" role="wrap">
-  <?dbhtml filename="check.html"?>
-
-  <title>Check-&check-version;</title>
-
-  <indexterm zone="ch-temp-system-check">
-    <primary sortas="a-Check">Check</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/check.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Check</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/check.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/check.xml"
-  xpointer="xpointer(id('contents-check'))"/>
-
-</sect1>
Index: OK/temp-system/64/cloog.xml
===================================================================
--- BOOK/temp-system/64/cloog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,67 +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-temp-system-cloog" role="wrap">
-  <?dbhtml filename="cloog.html"?>
-
-  <title>CLooG-&cloog-version;</title>
-
-  <indexterm zone="ch-temp-system-cloog">
-    <primary sortas="a-CLooG">CLooG</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/cloog.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of CLooG</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --enable-shared</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/cloog.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/cloog.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/cloog.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-cloog" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/file.xml
===================================================================
--- BOOK/temp-system/64/file.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,58 +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-temp-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-temp-system-file">
-    <primary sortas="a-File">File</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/64/gcc.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -71,19 +71,14 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --enable-c99 --enable-shared \
-    --enable-threads=posix --disable-nls --enable-__cxa_atexit \
-    --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \
-    --with-native-system-header-dir=/tools/include --enable-checking=release \
-    --enable-libstdcxx-time</userinput></screen>
+    --enable-threads=posix --disable-multilib --disable-nls \
+    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --with-system-zlib --with-native-system-header-dir=/tools/include \
+    --disable-libssp --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../multilib/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: OK/temp-system/64/gmp.xml
===================================================================
--- BOOK/temp-system/64/gmp.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,78 +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-temp-system-gmp" role="wrap">
-  <?dbhtml filename="gmp.html"?>
-
-  <title>GMP-&gmp-version;</title>
-
-  <indexterm zone="ch-temp-system-gmp">
-    <primary sortas="a-GMP">GMP</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gmp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>CC_FOR_BUILD=gcc CC="${CC} ${BUILD64}" \
-    CXX="${CXX} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --enable-cxx</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gmp.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gmp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gmp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/isl.xml
===================================================================
--- BOOK/temp-system/64/isl.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,59 +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-temp-system-isl" role="wrap">
-  <?dbhtml filename="isl.html"?>
-
-  <title>ISL-&isl-version;</title>
-
-  <indexterm zone="ch-temp-system-isl">
-    <primary sortas="a-ISL">ISL</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/isl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ISL</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-  ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/isl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-isl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/mpc.xml
===================================================================
--- BOOK/temp-system/64/mpc.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,59 +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-temp-system-mpc" role="wrap">
-  <?dbhtml filename="mpc.html"?>
-
-  <title>MPC-&mpc-version;</title>
-
-  <indexterm zone="ch-temp-system-mpc">
-    <primary sortas="a-MPC">MPC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/mpc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-  ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/mpfr.xml
===================================================================
--- BOOK/temp-system/64/mpfr.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,67 +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-temp-system-mpfr" role="wrap">
-  <?dbhtml filename="mpfr.html"?>
-
-  <title>MPFR-&mpfr-version;</title>
-
-  <indexterm zone="ch-temp-system-mpfr">
-    <primary sortas="a-MPFR">MPFR</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/mpfr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --enable-shared</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-mpfr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/ncurses.xml
===================================================================
--- BOOK/temp-system/64/ncurses.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,72 +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-temp-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-temp-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --with-shared --build=${CLFS_HOST} \
-   --host=${CLFS_TARGET} --without-debug --without-ada \
-   --enable-overwrite --with-build-cc=gcc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/util-linux.xml
===================================================================
--- BOOK/temp-system/64/util-linux.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,63 +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-temp-system-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
-
-  <title>Util-linux-&util-linux-version;</title>
-
-  <indexterm zone="ch-temp-system-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/64/variables.xml
===================================================================
--- BOOK/temp-system/64/variables.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
+++ BOOK/temp-system/64/variables.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -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-temp-system-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <para>Setup target-specific variables for the compiler
+  and linkers:</para>
+
+<screen><userinput>export CC="${CLFS_TARGET}-gcc ${BUILD64}"
+export CXX="${CLFS_TARGET}-g++ ${BUILD64}"
+export AR="${CLFS_TARGET}-ar"
+export AS="${CLFS_TARGET}-as"
+export RANLIB="${CLFS_TARGET}-ranlib"
+export LD="${CLFS_TARGET}-ld"
+export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
+
+    <variablelist os="ca">
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry os="dd1">
+        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
+        <listitem>
+          <para>This forces the C++ compiler to use our 64 Bit flags.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  <para>Then add the build variables to <filename>~/.bashrc</filename> to
+  prevent issues if you stop and come back later:</para>
+
+<screen><userinput>echo export CC=\""${CC}\"" &gt;&gt; ~/.bashrc
+echo export CXX=\""${CXX}\"" &gt;&gt; ~/.bashrc
+echo export AR=\""${AR}\"" &gt;&gt; ~/.bashrc
+echo export AS=\""${AS}\"" &gt;&gt; ~/.bashrc
+echo export RANLIB=\""${RANLIB}\"" &gt;&gt; ~/.bashrc
+echo export LD=\""${LD}\"" &gt;&gt; ~/.bashrc
+echo export STRIP=\""${STRIP}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+
+</sect1>
Index: OK/temp-system/64/xz.xml
===================================================================
--- BOOK/temp-system/64/xz.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,58 +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-temp-system-xz" role="wrap">
-  <?dbhtml filename="xz.html"?>
-
-  <title>XZ Utils-&xz-version;</title>
-
-  <indexterm zone="ch-temp-system-xz">
-    <primary sortas="a-XZ Utils">XZ Utils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/xz.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of XZ Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-xz" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/zlib.xml
===================================================================
--- BOOK/temp-system/64/zlib.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,62 +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-temp-system-zlib" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version;</title>
-
-  <indexterm zone="ch-temp-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/mips64-64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -13,33 +13,33 @@
 
   <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="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/cloog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -71,6 +71,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --enable-c99 \
@@ -82,8 +81,4 @@
     <variablelist>
       <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../multilib/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/mips64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/mips64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -13,5 +13,5 @@
 
   <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="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
@@ -23,22 +23,22 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/choose.xml"/>
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -71,6 +71,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools \
+<screen os="dc"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
     --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --target=${CLFS_TARGET} --with-local-prefix=/tools --enable-long-long \
Index: OK/temp-system/multilib/bash.xml
===================================================================
--- BOOK/temp-system/multilib/bash.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,80 +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-temp-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-temp-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/bash.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --without-bash-malloc --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bash" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/binutils.xml
===================================================================
--- BOOK/temp-system/multilib/binutils.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/binutils.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -44,5 +44,5 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
+<screen os="j"><userinput>../binutils-&binutils-dir;/configure \
     --prefix=/tools --libdir=/tools/lib64 --with-lib-path=/tools/lib64:/tools/lib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
Index: OK/temp-system/multilib/bison.xml
===================================================================
--- BOOK/temp-system/multilib/bison.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,67 +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-temp-system-bison" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version;</title>
-
-  <indexterm zone="ch-temp-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ca"><userinput>CC="${CC} ${BUILD64}" M4=m4 ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/bison.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/bzip2.xml
===================================================================
--- BOOK/temp-system/multilib/bzip2.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/bzip2.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -37,5 +37,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/bzip2.xml"
+    href="../common/bzip2.xml"
     xpointer="xpointer(//*[@os='cc'])"/>
 
Index: BOOK/temp-system/multilib/check.xml
===================================================================
--- BOOK/temp-system/multilib/check.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/check.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -30,5 +30,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="d"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64</userinput></screen>
 
Index: BOOK/temp-system/multilib/cloog.xml
===================================================================
--- BOOK/temp-system/multilib/cloog.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/cloog.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -27,5 +27,5 @@
 	xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64 \
      --enable-shared</userinput></screen>
Index: OK/temp-system/multilib/coreutils.xml
===================================================================
--- BOOK/temp-system/multilib/coreutils.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,79 +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-temp-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-temp-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/coreutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --enable-install-program=hostname --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='be1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-coreutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/diffutils.xml
===================================================================
--- BOOK/temp-system/multilib/diffutils.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,58 +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-temp-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-temp-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/diffutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-diffutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/file.xml
===================================================================
--- BOOK/temp-system/multilib/file.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/file.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
Index: OK/temp-system/multilib/findutils.xml
===================================================================
--- BOOK/temp-system/multilib/findutils.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,67 +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-temp-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-temp-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/findutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-findutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/flex.xml
===================================================================
--- BOOK/temp-system/multilib/flex.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/flex.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>CC="${CC} ${BUILD64}" M4=m4 ./configure --prefix=/tools \
+<screen os="cb"><userinput>M4=m4 ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --cache-file=config.cache</userinput></screen>
Index: OK/temp-system/multilib/gawk.xml
===================================================================
--- BOOK/temp-system/multilib/gawk.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,58 +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-temp-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-temp-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gawk.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gawk" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/gcc.xml
===================================================================
--- BOOK/temp-system/multilib/gcc.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/gcc.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -71,6 +71,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools \
+<screen os="dc"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
     --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --target=${CLFS_TARGET} --with-local-prefix=/tools --enable-long-long \
@@ -82,11 +81,4 @@
     <variablelist os="dd">
       <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dd1">
-        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>This forces the C++ compiler to use our 64 Bit flags.</para>
-        </listitem>
-      </varlistentry>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: OK/temp-system/multilib/gettext.xml
===================================================================
--- BOOK/temp-system/multilib/gettext.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,80 +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-temp-system-gettext" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version;</title>
-
-  <indexterm zone="ch-temp-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ./configure --prefix=/tools --disable-shared \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/gmp.xml
===================================================================
--- BOOK/temp-system/multilib/gmp.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/gmp.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -41,24 +41,11 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>CC_FOR_BUILD=gcc CC="${CC} \
-    ${BUILD64}" CXX="${CXX} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="c"><userinput>CC_FOR_BUILD=gcc ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64 --enable-cxx</userinput></screen>
 
-    <variablelist os="ca">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/gmp.xml"
-      xpointer="xpointer(//*[@os='ca1'])"/>
-
-      <varlistentry os="ca2">
-        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Tells the compiler to use our 64-bit build flags.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gmp.xml"
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: OK/temp-system/multilib/grep.xml
===================================================================
--- BOOK/temp-system/multilib/grep.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,63 +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-temp-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-temp-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/grep.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --without-included-regex</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-  <para>Details on this package are located in <xref
-  linkend="contents-grep" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/gzip.xml
===================================================================
--- BOOK/temp-system/multilib/gzip.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,58 +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-temp-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-temp-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/gzip.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gzip" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/isl.xml
===================================================================
--- BOOK/temp-system/multilib/isl.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/isl.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -27,6 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-  ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64</userinput></screen>
Index: OK/temp-system/multilib/m4.xml
===================================================================
--- BOOK/temp-system/multilib/m4.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,67 +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-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-cross-tools-m4">
-    <primary sortas="a-M4">M4</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='cc1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='cc2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-m4" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/make.xml
===================================================================
--- BOOK/temp-system/multilib/make.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,58 +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-temp-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-temp-system-make">
-    <primary sortas="a-Make">Make</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-make" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/mpc.xml
===================================================================
--- BOOK/temp-system/multilib/mpc.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/mpc.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -27,6 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-  ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64</userinput></screen>
Index: BOOK/temp-system/multilib/mpfr.xml
===================================================================
--- BOOK/temp-system/multilib/mpfr.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/mpfr.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir=/tools/lib64 --enable-shared</userinput></screen>
Index: BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/ncurses.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -39,6 +39,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --with-shared \
+<screen os="b"><userinput>./configure --prefix=/tools --with-shared \
    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    --without-debug --without-ada \
Index: OK/temp-system/multilib/patch.xml
===================================================================
--- BOOK/temp-system/multilib/patch.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,58 +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-temp-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-temp-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/patch.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-patch" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/sed.xml
===================================================================
--- BOOK/temp-system/multilib/sed.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,58 +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-temp-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-temp-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/sed.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sed" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/tar.xml
===================================================================
--- BOOK/temp-system/multilib/tar.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,67 +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-temp-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-temp-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/tar.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-tar" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/texinfo.xml
===================================================================
--- BOOK/temp-system/multilib/texinfo.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,63 +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-temp-system-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-temp-system-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/texinfo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>PERL=/usr/bin/perl CC="${CC} ${BUILD64}" \
-./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-texinfo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/util-linux.xml
===================================================================
--- BOOK/temp-system/multilib/util-linux.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/util-linux.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="be"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --libdir='${prefix}'/lib64 --disable-makeinstall-chown \
Index: OK/temp-system/multilib/vim.xml
===================================================================
--- BOOK/temp-system/multilib/vim.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ 	(revision )
@@ -1,110 +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-temp-system-vim" role="wrap">
-  <?dbhtml filename="vim.html"?>
-
-  <title>Vim-&vim-version;</title>
-
-  <indexterm zone="ch-temp-system-vim">
-    <primary sortas="a-Vim">Vim</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/vim.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of VIM</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --prefix=/tools --enable-multibyte --enable-gui=no \
-    --disable-gtktest --disable-xim --with-features=normal \
-    --disable-gpm --without-x --disable-netbeans \
-    --with-tlib=ncurses</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='tv1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='tv2'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-vim" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/xz.xml
===================================================================
--- BOOK/temp-system/multilib/xz.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/xz.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="cb"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="cb"><userinput>./configure --prefix=/tools \
      --build=${CLFS_HOST} --host=${CLFS_TARGET} \
      --libdir=/tools/lib64</userinput></screen>
Index: BOOK/temp-system/multilib/zlib.xml
===================================================================
--- BOOK/temp-system/multilib/zlib.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/multilib/zlib.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -31,6 +31,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/ppc64-64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/ppc64-64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -13,33 +13,33 @@
 
   <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="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/cloog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/ppc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64-64/gcc.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/ppc64-64/gcc.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -71,6 +71,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --enable-long-long --enable-c99 \
@@ -82,8 +81,4 @@
     <variablelist>
       <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../multilib/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/ppc64-chapter.xml
===================================================================
--- BOOK/temp-system/ppc64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/ppc64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -12,5 +12,5 @@
 
   <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="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
@@ -22,22 +22,22 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/choose.xml"/>
Index: BOOK/temp-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/sparc64-64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -13,33 +13,33 @@
 
   <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="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/cloog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/sparc64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/sparc64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -13,5 +13,5 @@
 
   <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="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
@@ -23,22 +23,22 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/choose.xml"/>
Index: BOOK/temp-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/x86_64-64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -13,33 +13,33 @@
 
   <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="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gmp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/isl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/cloog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/zlib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/x86_64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-chapter.xml	(revision dfd73bad2c0164f2a0500bdca148a35f381e206c)
+++ BOOK/temp-system/x86_64-chapter.xml	(revision 8ffe6ef89c40150388a1b938b4d35b284bcbfce4)
@@ -13,5 +13,5 @@
 
   <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="common/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/mpfr.xml"/>
@@ -23,22 +23,22 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/choose.xml"/>
