Index: BOOK/boot/64/flags.xml
===================================================================
--- BOOK/boot/64/flags.xml	(revision f0505e9006a862612358e73e30eb5b711202c333)
+++ BOOK/boot/64/flags.xml	(revision f0505e9006a862612358e73e30eb5b711202c333)
@@ -0,0 +1,17 @@
+<?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-flags">
+  <?dbhtml filename="flags.html"?>
+
+  <title>Build Flags</title>
+
+  <para>We will need to copy our build variables into our new system:</para>
+
+<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
+
+</sect1>
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ BOOK/boot/mips64-64-chapter.xml	(revision f0505e9006a862612358e73e30eb5b711202c333)
@@ -28,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
Index: OK/boot/mips64-64/flags.xml
===================================================================
--- BOOK/boot/mips64-64/flags.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ 	(revision )
@@ -1,17 +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-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: BOOK/boot/ppc64-64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-64-chapter.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ BOOK/boot/ppc64-64-chapter.xml	(revision f0505e9006a862612358e73e30eb5b711202c333)
@@ -29,5 +29,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision f0505e9006a862612358e73e30eb5b711202c333)
@@ -28,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
Index: OK/boot/sparc64-64/flags.xml
===================================================================
--- BOOK/boot/sparc64-64/flags.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ 	(revision )
@@ -1,17 +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-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ BOOK/boot/sparc64-chapter.xml	(revision f0505e9006a862612358e73e30eb5b711202c333)
@@ -28,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
Index: OK/boot/sparc64/flags.xml
===================================================================
--- BOOK/boot/sparc64/flags.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ 	(revision )
@@ -1,21 +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-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-export CLFS_TARGET32="${CLFS_TARGET32}"
-EOF</userinput></screen>
-
-</sect1>
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision f0505e9006a862612358e73e30eb5b711202c333)
@@ -27,5 +27,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/changingowner.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/howtoview.xml"/>
Index: OK/boot/x86_64-64/flags.xml
===================================================================
--- BOOK/boot/x86_64-64/flags.xml	(revision 8a40cc1976b4227a2b727c436a35bd4e021a6fc4)
+++ 	(revision )
@@ -1,17 +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-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
