r6676 - in branches/cross-lfs/BOOK: . cross-tools/64 cross-tools/common cross-tools/mips64 cross-tools/mips64-64 cross-tools/sparc64 cross-tools/sparc64-64 cross-tools/x86_64 cross-tools/x86_64-64 final-system/64 final-system/common final-system/multilib temp-system/64 temp-system/common temp-system/multilib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Aug 14 01:28:14 PDT 2005


Author: manuel
Date: 2005-08-14 02:28:09 -0600 (Sun, 14 Aug 2005)
New Revision: 6676

Modified:
   branches/cross-lfs/BOOK/cross-tools/64/binutils.xml
   branches/cross-lfs/BOOK/cross-tools/common/binutils.xml
   branches/cross-lfs/BOOK/cross-tools/mips64-64/binutils.xml
   branches/cross-lfs/BOOK/cross-tools/mips64/binutils.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64-64/binutils.xml
   branches/cross-lfs/BOOK/cross-tools/sparc64/binutils.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64-64/binutils.xml
   branches/cross-lfs/BOOK/cross-tools/x86_64/binutils.xml
   branches/cross-lfs/BOOK/final-system/64/binutils.xml
   branches/cross-lfs/BOOK/final-system/common/binutils.xml
   branches/cross-lfs/BOOK/final-system/multilib/binutils.xml
   branches/cross-lfs/BOOK/general.ent
   branches/cross-lfs/BOOK/temp-system/64/binutils.xml
   branches/cross-lfs/BOOK/temp-system/common/binutils.xml
   branches/cross-lfs/BOOK/temp-system/multilib/binutils.xml
Log:
Xinclude redo on Binutils pages.

Modified: branches/cross-lfs/BOOK/cross-tools/64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/cross-tools/64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -43,27 +43,32 @@
   <sect2 role="installation">
     <title>Installation of Cross Binutils</title>
 
-    <para>To make sure that we use the proper syntax for a couple of
-    tools, we apply the following patch:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
-<screen><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/para[5])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/screen[3])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Prepare Binutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
+<screen os="ca"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
    --host=${LFS_HOST} --target=${LFS_TARGET} --with-lib-path=/tools/lib \
    --disable-nls --enable-shared --enable-64-bit-bfd \
    --disable-multilib</userinput></screen>
 
-    <variablelist>
+    <variablelist os="cb">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -124,20 +129,29 @@
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
-<screen><userinput>make configure-host
-make headers -C bfd
-make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-    <para>Copy <filename class="headerfile">libiberty.h</filename> file to
-    <filename class="directory">/tools/include</filename> directory:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /tools/include</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/cross-tools/common/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/common/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/cross-tools/common/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -43,26 +43,28 @@
   <sect2 role="installation">
     <title>Installation of Cross Binutils</title>
 
-    <para>To make sure that we use the proper syntax for a couple of
-    tools, we apply the following patch:</para>
+    <para os="ba">To make sure that the proper syntax is used for a couple of
+    tools, apply the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
+<screen os="bb"><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/para[5])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/screen[3])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Prepare Binutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
+<screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
    --host=${LFS_HOST} --target=${LFS_TARGET} --with-lib-path=/tools/lib \
    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
-    <variablelist>
+    <variablelist os="bd">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -123,20 +125,20 @@
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="be">Compile the package:</para>
 
-<screen><userinput>make configure-host
+<screen os="bf"><userinput>make configure-host
 make headers -C bfd
 make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="bg">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="bh"><userinput>make install</userinput></screen>
 
-    <para>Copy <filename class="headerfile">libiberty.h</filename> file to
+    <para os="bi">Copy <filename class="headerfile">libiberty.h</filename> file to
     <filename class="directory">/tools/include</filename> directory:</para>
 
-<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /tools/include</userinput></screen>
+<screen os="bj"><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /tools/include</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/cross-tools/mips64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -45,62 +45,63 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
-    <para>The following patch makes binutils search in both the
-    <filename class="directory">lib</filename> and <filename
-    class="directory">lib64</filename> directories in a multilib
-    environment:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen><userinput>patch -Np1 -i ../&binutils-multilib-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='bh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='bi'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/cross-tools/mips64-64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64-64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/cross-tools/mips64-64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -45,55 +45,55 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='bh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='bi'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -45,63 +45,63 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../final-system/multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../final-system/multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='bh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='bi'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/cross-tools/sparc64-64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/sparc64-64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/cross-tools/sparc64-64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -45,63 +45,55 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='bh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='bi'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -44,64 +44,64 @@
     <title>Installation of Cross Binutils</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../final-system/multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../final-system/multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/cross-tools/x86_64-64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86_64-64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/cross-tools/x86_64-64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -44,65 +44,57 @@
     <title>Installation of Cross Binutils</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    href="../64/binutils.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/final-system/64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/final-system/64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -19,8 +19,9 @@
   <sect2 id="package-binutils" role="package">
     <title/>
 
-    <para>The Binutils package contains a linker, an assembler, and other
-    tools for handling object files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(id('package-binutils')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -32,314 +33,106 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(id('package-binutils')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Bash, Coreutils, Diffutils, GCC, Gettext,
-        Glibc, Grep, Make, Perl, Sed, and Texinfo</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
   <sect2 id="install-binutils" role="installation">
     <title>Installation of Binutils</title>
 
-    <para>This package is known to have issues when its default
-    optimization flags (including the <option>-march</option> and
-    <option>-mcpu</option> options) are changed. If any environment
-    variables that override default optimizations have been defined, such
-    as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
-    unset them when building Binutils.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Verify that the PTYs are working properly inside the chroot
-    environment. Check that everything is set up correctly by performing a
-    simple test:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>expect -c "spawn ls"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>If the following message shows up, the chroot environment is not
-    set up for proper PTY operation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><computeroutput>The system has no more ptys.
-Ask your system administrator to create more.</computeroutput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>This issue needs to be resolved before running the test suites
-    for Binutils and GCC.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>The Binutils documentation recommends building Binutils outside of the
-    source directory in a dedicated build directory:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>mkdir ../binutils-build
-cd ../binutils-build</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Prepare Binutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr \
     --enable-shared --disable-multilib</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen><userinput>make configure-host</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <important>
-      <para>During make configure-host you may receive the following
-      error message. It is safe to ignore.</para>
-      <para>WARNING: `flex' is missing on your system.  You should only need it if
-      you modified a `.l' file.  You may need the `Flex' package
-      in order for those modifications to take effect.  You can get
-      `Flex' from any GNU archive site.</para>
-    </important>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>make tooldir=/usr</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <para>Normally, the tooldir (the directory where the executables
-    will ultimately be located) is set to <filename
-    class="directory">$(exec_prefix)/$(target_alias)</filename>. For
-    example, i686 machines would expand that to <filename
-    class="directory">/usr/i686-pc-linux-gnu</filename>. Because this
-    is a custom system, this target-specific directory in <filename
-    class="directory">/usr</filename> is not required. <filename
-    class="directory">$(exec_prefix)/$(target_alias)</filename> would
-    be used if the system was used to cross-compile (for example,
-    compiling a package on an Intel machine that generates code that
-    can be executed on PowerPC machines).</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
-    <important>
-      <para>The test suite for Binutils in this section is  considered critical.
-      Do not skip it under any circumstances.</para>
-    </important>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
-    <para>Test the results:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
 
-<screen><userinput>make check</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='r'])"/>
 
-<screen><userinput>make tooldir=/usr install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
 
-    <para>Install the <filename class="headerfile">libiberty</filename> header
-    file that is needed by some packages:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='t'])"/>
 
-<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
 
   </sect2>
 
-  <sect2 id="contents-binutils" role="content">
-    <title>Contents of Binutils</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/binutils.xml"
+  xpointer="xpointer(id('contents-binutils'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump,
-        ranlib, readelf, size, strings, and strip</seg>
-        <seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addr2line">
-        <term><command>addr2line</command></term>
-        <listitem>
-          <para>Translates program addresses to file names and line numbers;
-          given an address and the name of an executable, it uses the debugging
-          information in the executable to determine which source file and line
-          number are associated with the address</para>
-          <indexterm zone="ch-system-binutils addr2line">
-            <primary sortas="b-addr2line">addr2line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ar">
-        <term><command>ar</command></term>
-        <listitem>
-          <para>Creates, modifies, and extracts from archives</para>
-          <indexterm zone="ch-system-binutils ar">
-            <primary sortas="b-ar">ar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="as">
-        <term><command>as</command></term>
-        <listitem>
-          <para>An assembler that assembles the output of <command>gcc</command>
-          into object files</para>
-          <indexterm zone="ch-system-binutils as">
-            <primary sortas="b-as">as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c-filt">
-        <term><command>c++filt</command></term>
-        <listitem>
-          <para>Used by the linker to de-mangle C++ and Java symbols and to keep
-          overloaded functions from clashing</para>
-          <indexterm zone="ch-system-binutils c-filt">
-            <primary sortas="b-c++filt">c++filt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gprof">
-        <term><command>gprof</command></term>
-        <listitem>
-          <para>Displays call graph profile data</para>
-          <indexterm zone="ch-system-binutils gprof">
-            <primary sortas="b-gprof">gprof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld">
-        <term><command>ld</command></term>
-        <listitem>
-          <para>A linker that combines a number of object and archive files
-          into a single file, relocating their data and tying up symbol
-          references</para>
-          <indexterm zone="ch-system-binutils ld">
-            <primary sortas="b-ld">ld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nm">
-        <term><command>nm</command></term>
-        <listitem>
-          <para>Lists the symbols occurring in a given object file</para>
-          <indexterm zone="ch-system-binutils nm">
-            <primary sortas="b-nm">nm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objcopy">
-        <term><command>objcopy</command></term>
-        <listitem>
-          <para>Translates one type of object file into another</para>
-          <indexterm zone="ch-system-binutils objcopy">
-            <primary sortas="b-objcopy">objcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objdump">
-        <term><command>objdump</command></term>
-        <listitem>
-          <para>Displays information about the given object file, with options
-          controlling the particular information to display; the information
-          shown is useful to programmers who are working on the compilation
-          tools</para>
-          <indexterm zone="ch-system-binutils objdump">
-            <primary sortas="b-objdump">objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ranlib">
-        <term><command>ranlib</command></term>
-        <listitem>
-          <para>Generates an index of the contents of an archive and stores it
-          in the archive; the index lists all of the symbols defined by archive
-          members that are relocatable object files</para>
-          <indexterm zone="ch-system-binutils ranlib">
-            <primary sortas="b-ranlib">ranlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readelf">
-        <term><command>readelf</command></term>
-        <listitem>
-          <para>Displays information about ELF type binaries</para>
-          <indexterm zone="ch-system-binutils readelf">
-            <primary sortas="b-readelf">readelf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="size">
-        <term><command>size</command></term>
-        <listitem>
-          <para>Lists the section sizes and the total size for the given
-          object files</para>
-          <indexterm zone="ch-system-binutils size">
-            <primary sortas="b-size">size</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strings">
-        <term><command>strings</command></term>
-        <listitem>
-          <para>Outputs, for each given file, the sequences of printable
-          characters that are of at least the specified length (defaulting to
-          four); for object files, it prints, by default, only the strings from
-          the initializing and loading sections while for other types of files,
-          it scans the entire file</para>
-          <indexterm zone="ch-system-binutils strings">
-            <primary sortas="b-strings">strings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strip">
-        <term><command>strip</command></term>
-        <listitem>
-          <para>Discards symbols from object files</para>
-          <indexterm zone="ch-system-binutils strip">
-            <primary sortas="b-strip">strip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libiberty">
-        <term><filename class="libraryfile">libiberty</filename></term>
-        <listitem>
-          <para>Contains routines used by various GNU programs, including
-          <command>getopt</command>, <command>obstack</command>,
-          <command>strerror</command>, <command>strtol</command>, and
-          <command>strtoul</command></para>
-          <indexterm zone="ch-system-binutils libiberty">
-            <primary sortas="c-libiberty">libiberty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbfd">
-        <term><filename class="libraryfile">libbfd</filename></term>
-        <listitem>
-          <para>The Binary File Descriptor library</para>
-          <indexterm zone="ch-system-binutils libbfd">
-            <primary sortas="c-libbfd">libbfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libopcodes">
-        <term><filename class="libraryfile">libopcodes</filename></term>
-        <listitem>
-          <para>A library for dealing with opcodes—the <quote>readable
-          text</quote> versions of instructions for the processor;
-          it is used for building utilities like
-          <command>objdump</command>.</para>
-          <indexterm zone="ch-system-binutils libopcodes">
-            <primary sortas="c-libopcodes">libopcodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/common/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/final-system/common/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -46,55 +46,56 @@
   <sect2 id="install-binutils" role="installation">
     <title>Installation of Binutils</title>
 
-    <para>This package is known to have issues when its default
+    <para os="a">This package is known to have issues when its default
     optimization flags (including the <option>-march</option> and
     <option>-mcpu</option> options) are changed. If any environment
     variables that override default optimizations have been defined, such
     as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
     unset them when building Binutils.</para>
 
-    <para>Verify that the PTYs are working properly inside the chroot
+    <para os="b">Verify that the PTYs are working properly inside the build
     environment. Check that everything is set up correctly by performing a
     simple test:</para>
 
-<screen><userinput>expect -c "spawn ls"</userinput></screen>
+<screen os="c"><userinput>expect -c "spawn ls"</userinput></screen>
 
-    <para>If the following message shows up, the chroot environment is not
+    <para os="d">If the following message shows up, the environment is not
     set up for proper PTY operation:</para>
 
-<screen><computeroutput>The system has no more ptys.
+<screen os="e"><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
 
-    <para>This issue needs to be resolved before running the test suites
+    <para os="f">This issue needs to be resolved before running the test suites
     for Binutils and GCC.</para>
 
-    <para>The Binutils documentation recommends building Binutils outside of the
+    <para os="g">The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
-<screen><userinput>mkdir ../binutils-build
+<screen os="h"><userinput>mkdir ../binutils-build
 cd ../binutils-build</userinput></screen>
 
-    <para>Prepare Binutils for compilation:</para>
+    <para os="i">Prepare Binutils for compilation:</para>
 
 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr \
     --enable-shared</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="j">Compile the package:</para>
 
-<screen><userinput>make configure-host</userinput></screen>
+<screen os="k"><userinput>make configure-host</userinput></screen>
 
-    <important>
-      <para>During make configure-host you may receive the following
-      error message. It is safe to ignore.</para>
-      <para>WARNING: `flex' is missing on your system.  You should only need it if
-      you modified a `.l' file.  You may need the `Flex' package
-      in order for those modifications to take effect.  You can get
-      `Flex' from any GNU archive site.</para>
+    <important os="l">
+      <para>During <command>make configure-host</command> you may receive the
+      following error message. It is safe to ignore.</para>
+
+<screen><computeroutput>WARNING: `flex' is missing on your system. You should only
+need it if you modified a `.l' file. You may need the `Flex'
+package in order for those modifications to take effect. You
+can get `Flex' from any GNU archive site.</computeroutput></screen>
     </important>
 
-<screen><userinput>make tooldir=/usr</userinput></screen>
+<screen os="m"><userinput>make tooldir=/usr</userinput></screen>
 
-    <para>Normally, the tooldir (the directory where the executables
+    <para os="n">Normally, the tooldir (the directory where the executables
     will ultimately be located) is set to <filename
     class="directory">$(exec_prefix)/$(target_alias)</filename>. For
     example, i686 machines would expand that to <filename
@@ -106,23 +107,23 @@
     compiling a package on an Intel machine that generates code that
     can be executed on PowerPC machines).</para>
 
-    <important>
+    <important os="o">
       <para>The test suite for Binutils in this section is  considered critical.
       Do not skip it under any circumstances.</para>
     </important>
 
-    <para>Test the results:</para>
+    <para os="p">Test the results:</para>
 
-<screen><userinput>make check</userinput></screen>
+<screen os="q"><userinput>make check</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="r">Install the package:</para>
 
-<screen><userinput>make tooldir=/usr install</userinput></screen>
+<screen os="s"><userinput>make tooldir=/usr install</userinput></screen>
 
-    <para>Install the <filename class="headerfile">libiberty</filename> header
+    <para os="t">Install the <filename class="headerfile">libiberty</filename> header
     file that is needed by some packages:</para>
 
-<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
+<screen os="u"><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/final-system/multilib/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -19,8 +19,9 @@
   <sect2 id="package-binutils" role="package">
     <title/>
 
-    <para>The Binutils package contains a linker, an assembler, and other
-    tools for handling object files.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(id('package-binutils')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -32,321 +33,113 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(id('package-binutils')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Bash, Coreutils, Diffutils, GCC, Gettext,
-        Glibc, Grep, Make, Perl, Sed, and Texinfo</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
   <sect2 id="install-binutils" role="installation">
     <title>Installation of Binutils</title>
 
-    <para>This package is known to have issues when its default
-    optimization flags (including the <option>-march</option> and
-    <option>-mcpu</option> options) are changed. If any environment
-    variables that override default optimizations have been defined, such
-    as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
-    unset them when building Binutils.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Verify that the PTYs are working properly inside the chroot
-    environment. Check that everything is set up correctly by performing a
-    simple test:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>expect -c "spawn ls"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>If the following message shows up, the chroot environment is not
-    set up for proper PTY operation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><computeroutput>The system has no more ptys.
-Ask your system administrator to create more.</computeroutput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>This issue needs to be resolved before running the test suites
-    for Binutils and GCC.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>The following patch makes binutils search in both the
+    <para os="aa">The following patch makes Binutils search in both the
     <filename class="directory">lib</filename> and <filename
     class="directory">lib64</filename> directories in a multilib
     environment:</para>
 
-<screen><userinput>patch -Np1 -i ../&binutils-multilib-patch;</userinput></screen>
+<screen os="ab"><userinput>patch -Np1 -i ../&binutils-multilib-patch;</userinput></screen>
 
-    <para>The Binutils documentation recommends building Binutils outside of the
-    source directory in a dedicated build directory:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>mkdir ../binutils-build
-cd ../binutils-build</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Prepare Binutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ../binutils-&binutils-version;/configure --prefix=/usr \
     --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen><userinput>make configure-host</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <important>
-      <para>During make configure-host you may receive the following
-      error message. It is safe to ignore.</para>
-      <para>WARNING: `flex' is missing on your system.  You should only need it if
-      you modified a `.l' file.  You may need the `Flex' package
-      in order for those modifications to take effect.  You can get
-      `Flex' from any GNU archive site.</para>
-    </important>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>make tooldir=/usr</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <para>Normally, the tooldir (the directory where the executables
-    will ultimately be located) is set to <filename
-    class="directory">$(exec_prefix)/$(target_alias)</filename>. For
-    example, i686 machines would expand that to <filename
-    class="directory">/usr/i686-pc-linux-gnu</filename>. Because this
-    is a custom system, this target-specific directory in <filename
-    class="directory">/usr</filename> is not required. <filename
-    class="directory">$(exec_prefix)/$(target_alias)</filename> would
-    be used if the system was used to cross-compile (for example,
-    compiling a package on an Intel machine that generates code that
-    can be executed on PowerPC machines).</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
-    <important>
-      <para>The test suite for Binutils in this section is  considered critical.
-      Do not skip it under any circumstances.</para>
-    </important>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
-    <para>Test the results:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
 
-<screen><userinput>make check</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='r'])"/>
 
-<screen><userinput>make tooldir=/usr install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
 
-    <para>Install the <filename class="headerfile">libiberty</filename> header
-    file that is needed by some packages:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='t'])"/>
 
-<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
 
   </sect2>
 
-  <sect2 id="contents-binutils" role="content">
-    <title>Contents of Binutils</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/binutils.xml"
+  xpointer="xpointer(id('contents-binutils'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump,
-        ranlib, readelf, size, strings, and strip</seg>
-        <seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addr2line">
-        <term><command>addr2line</command></term>
-        <listitem>
-          <para>Translates program addresses to file names and line numbers;
-          given an address and the name of an executable, it uses the debugging
-          information in the executable to determine which source file and line
-          number are associated with the address</para>
-          <indexterm zone="ch-system-binutils addr2line">
-            <primary sortas="b-addr2line">addr2line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ar">
-        <term><command>ar</command></term>
-        <listitem>
-          <para>Creates, modifies, and extracts from archives</para>
-          <indexterm zone="ch-system-binutils ar">
-            <primary sortas="b-ar">ar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="as">
-        <term><command>as</command></term>
-        <listitem>
-          <para>An assembler that assembles the output of <command>gcc</command>
-          into object files</para>
-          <indexterm zone="ch-system-binutils as">
-            <primary sortas="b-as">as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c-filt">
-        <term><command>c++filt</command></term>
-        <listitem>
-          <para>Used by the linker to de-mangle C++ and Java symbols and to keep
-          overloaded functions from clashing</para>
-          <indexterm zone="ch-system-binutils c-filt">
-            <primary sortas="b-c++filt">c++filt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gprof">
-        <term><command>gprof</command></term>
-        <listitem>
-          <para>Displays call graph profile data</para>
-          <indexterm zone="ch-system-binutils gprof">
-            <primary sortas="b-gprof">gprof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld">
-        <term><command>ld</command></term>
-        <listitem>
-          <para>A linker that combines a number of object and archive files
-          into a single file, relocating their data and tying up symbol
-          references</para>
-          <indexterm zone="ch-system-binutils ld">
-            <primary sortas="b-ld">ld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nm">
-        <term><command>nm</command></term>
-        <listitem>
-          <para>Lists the symbols occurring in a given object file</para>
-          <indexterm zone="ch-system-binutils nm">
-            <primary sortas="b-nm">nm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objcopy">
-        <term><command>objcopy</command></term>
-        <listitem>
-          <para>Translates one type of object file into another</para>
-          <indexterm zone="ch-system-binutils objcopy">
-            <primary sortas="b-objcopy">objcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objdump">
-        <term><command>objdump</command></term>
-        <listitem>
-          <para>Displays information about the given object file, with options
-          controlling the particular information to display; the information
-          shown is useful to programmers who are working on the compilation
-          tools</para>
-          <indexterm zone="ch-system-binutils objdump">
-            <primary sortas="b-objdump">objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ranlib">
-        <term><command>ranlib</command></term>
-        <listitem>
-          <para>Generates an index of the contents of an archive and stores it
-          in the archive; the index lists all of the symbols defined by archive
-          members that are relocatable object files</para>
-          <indexterm zone="ch-system-binutils ranlib">
-            <primary sortas="b-ranlib">ranlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readelf">
-        <term><command>readelf</command></term>
-        <listitem>
-          <para>Displays information about ELF type binaries</para>
-          <indexterm zone="ch-system-binutils readelf">
-            <primary sortas="b-readelf">readelf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="size">
-        <term><command>size</command></term>
-        <listitem>
-          <para>Lists the section sizes and the total size for the given
-          object files</para>
-          <indexterm zone="ch-system-binutils size">
-            <primary sortas="b-size">size</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strings">
-        <term><command>strings</command></term>
-        <listitem>
-          <para>Outputs, for each given file, the sequences of printable
-          characters that are of at least the specified length (defaulting to
-          four); for object files, it prints, by default, only the strings from
-          the initializing and loading sections while for other types of files,
-          it scans the entire file</para>
-          <indexterm zone="ch-system-binutils strings">
-            <primary sortas="b-strings">strings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strip">
-        <term><command>strip</command></term>
-        <listitem>
-          <para>Discards symbols from object files</para>
-          <indexterm zone="ch-system-binutils strip">
-            <primary sortas="b-strip">strip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libiberty">
-        <term><filename class="libraryfile">libiberty</filename></term>
-        <listitem>
-          <para>Contains routines used by various GNU programs, including
-          <command>getopt</command>, <command>obstack</command>,
-          <command>strerror</command>, <command>strtol</command>, and
-          <command>strtoul</command></para>
-          <indexterm zone="ch-system-binutils libiberty">
-            <primary sortas="c-libiberty">libiberty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbfd">
-        <term><filename class="libraryfile">libbfd</filename></term>
-        <listitem>
-          <para>The Binary File Descriptor library</para>
-          <indexterm zone="ch-system-binutils libbfd">
-            <primary sortas="c-libbfd">libbfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libopcodes">
-        <term><filename class="libraryfile">libopcodes</filename></term>
-        <listitem>
-          <para>A library for dealing with opcodes—the <quote>readable
-          text</quote> versions of instructions for the processor;
-          it is used for building utilities like
-          <command>objdump</command>.</para>
-          <indexterm zone="ch-system-binutils libopcodes">
-            <primary sortas="c-libopcodes">libopcodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-14 08:28:09 UTC (rev 6676)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050812">
+<!ENTITY version "7.0-cross-lfs-20050814">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64">
 <!ENTITY version-ppc "&version;-PowerPC">
@@ -8,7 +8,7 @@
 <!ENTITY version-mips "&version;-MIPS">
 <!ENTITY version-mips64 "&version;-MIPS64">
 
-<!ENTITY releasedate "August 12, 2005">
+<!ENTITY releasedate "August 14, 2005">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 

Modified: branches/cross-lfs/BOOK/temp-system/64/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/temp-system/64/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -45,23 +45,23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/para[5])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/screen[3])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <!-- To be moved to their proper file (or full removed) when decided
     how to manage SBUs
@@ -77,7 +77,9 @@
 
     -->
 
-    <para>Now prepare Binutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" \
      ../binutils-&binutils-version;/configure --prefix=/tools \
@@ -97,20 +99,29 @@
 
     </variablelist>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
-<screen><userinput>make configure-host
-make headers -C bfd
-make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-    <para>Copy <filename class="headerfile">libiberty.h</filename> file to
-    <filename class="directory">/tools/include</filename> directory:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /tools/include</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/temp-system/common/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -43,26 +43,26 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
 
-    <para>It is important that Binutils be the first package compiled
+    <para os="da">It is important that Binutils be the first package compiled
     because both Glibc and GCC perform various tests on the available
     linker and assembler to determine which of their own features to
     enable.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/para[5])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/screen[3])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <!-- To be moved to their proper file (or full removed) when decided
     how to manage SBUs
@@ -78,22 +78,38 @@
 
     -->
 
-    <para>Now prepare Binutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
      --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
      --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/binutils.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
-<screen><userinput>make configure-host
-make headers -C bfd
-make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/binutils.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/binutils.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/binutils.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/binutils.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/binutils.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/temp-system/multilib/binutils.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/binutils.xml	2005-08-13 11:11:27 UTC (rev 6675)
+++ branches/cross-lfs/BOOK/temp-system/multilib/binutils.xml	2005-08-14 08:28:09 UTC (rev 6676)
@@ -45,31 +45,31 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='da'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../../final-system/multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/binutils.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../../final-system/multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/para[5])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(id('install-binutils')/screen[3])"/>
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <!-- To be moved to their proper file (or full removed) when decided
     how to manage SBUs
@@ -85,7 +85,9 @@
 
     -->
 
-    <para>Now prepare Binutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" \
      ../binutils-&binutils-version;/configure --prefix=/tools \
@@ -105,20 +107,29 @@
 
     </variablelist>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
-<screen><userinput>make configure-host
-make headers -C bfd
-make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-    <para>Copy <filename class="headerfile">libiberty.h</filename> file to
-    <filename class="directory">/tools/include</filename> directory:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-<screen><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /tools/include</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/binutils.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 




More information about the lfs-book mailing list