r6743 - in branches/cross-lfs/BOOK/final-system: common mips mips64 mips64-64 multilib ppc sparc sparc64 sparc64-64 x86 x86_64 x86_64-64

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue Aug 23 12:14:43 PDT 2005


Author: manuel
Date: 2005-08-23 13:14:42 -0600 (Tue, 23 Aug 2005)
New Revision: 6743

Modified:
   branches/cross-lfs/BOOK/final-system/common/autoconf.xml
   branches/cross-lfs/BOOK/final-system/common/automake.xml
   branches/cross-lfs/BOOK/final-system/common/less.xml
   branches/cross-lfs/BOOK/final-system/mips/adjusting.xml
   branches/cross-lfs/BOOK/final-system/mips64-64/adjusting.xml
   branches/cross-lfs/BOOK/final-system/mips64/adjusting.xml
   branches/cross-lfs/BOOK/final-system/multilib/autoconf.xml
   branches/cross-lfs/BOOK/final-system/multilib/automake.xml
   branches/cross-lfs/BOOK/final-system/multilib/less.xml
   branches/cross-lfs/BOOK/final-system/ppc/adjusting.xml
   branches/cross-lfs/BOOK/final-system/sparc/adjusting.xml
   branches/cross-lfs/BOOK/final-system/sparc64-64/adjusting.xml
   branches/cross-lfs/BOOK/final-system/sparc64/adjusting.xml
   branches/cross-lfs/BOOK/final-system/x86/adjusting.xml
   branches/cross-lfs/BOOK/final-system/x86_64-64/adjusting.xml
   branches/cross-lfs/BOOK/final-system/x86_64/adjusting.xml
Log:
More Xinclude redo on final-system.

Modified: branches/cross-lfs/BOOK/final-system/common/autoconf.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/autoconf.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/common/autoconf.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -45,20 +45,20 @@
   <sect2 id="install-autoconf" role="installation">
     <title>Installation of Autoconf</title>
 
-    <para>Prepare Autoconf for compilation:</para>
+    <para os="a">Prepare Autoconf for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="b">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="c"><userinput>make</userinput></screen>
 
-    <para os="a">To test the results, issue: <userinput>make check</userinput>.
+    <para os="d">To test the results, issue: <userinput>make check</userinput>.
     This takes a long time, about 2 SBUs.</para>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/automake.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/automake.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/common/automake.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -46,20 +46,20 @@
   <sect2 id="install-automake" role="installation">
     <title>Installation of Automake</title>
 
-    <para>Prepare Automake for compilation:</para>
+    <para os="a">Prepare Automake for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="b">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="c"><userinput>make</userinput></screen>
 
-    <para os="a">To test the results, issue: <userinput>make check</userinput>.
+    <para os="d">To test the results, issue: <userinput>make check</userinput>.
     This takes a long time, about 5 SBUs.</para>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/less.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/less.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/common/less.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -45,11 +45,11 @@
   <sect2 id="install-less" role="installation">
     <title>Installation of Less</title>
 
-    <para>Prepare Less for compilation:</para>
+    <para os="a">Prepare Less for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin --sysconfdir=/etc</userinput></screen>
 
-    <variablelist os="a">
+    <variablelist os="b">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -62,13 +62,13 @@
       </varlistentry>
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/mips/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/mips/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -12,44 +12,56 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/adjusting.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/adjusting.xml"
-  xpointer="xpointer(/sect1/warning[1])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>perl -pi -e 's@ /tools/lib/ld.so.1@ /lib/ld.so.1 at g;' \
+<screen os="c"><userinput>perl -pi -e 's@ /tools/lib/ld.so.1@ /lib/ld.so.1 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
-    `gcc --print-file specs`</userinput></screen>
+        `gcc --print-file specs`</userinput></screen>
 
-<caution><para>It is imperative at this point to stop and ensure that
-the basic functions (compiling and linking) of the adjusted toolchain
-are working as expected. To do this, perform a sanity
-check:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>echo 'main(){}' > dummy.c
-cc dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+  <caution>
 
-<screen><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<para>Note that <filename class="directory">/lib</filename> is now
-the prefix of our dynamic linker.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<para>If the output does not appear as shown above or is not received
-at all, then something is seriously wrong. Investigate and retrace the
-steps to find out where the problem is and correct it. The most likely
-reason is that something went wrong with the specs file amendment
-above. Any issues will need to be resolved before continuing on with
-the process.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<para>Once everything is working correctly, clean up the test
-files:</para>
+<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
 
-<screen><userinput>rm dummy.c a.out</userinput></screen></caution>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+  </caution>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/mips64/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/mips64/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -10,97 +10,102 @@
 
   <title>Adjusting the Toolchain</title>
 
-  <para>Now we amend the GCC specs file so that it points to the new
-  dynamic linker. A <command>perl</command> command accomplishes this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/adjusting.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-  <warning>
-    <para><emphasis>Do not</emphasis> run the following command more than
-    once, it will adversely affect the outcome of software built after
-    this step.</para>
-  </warning>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/adjusting.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-<para>First we will adjust the 32 bit ABI:</para>
+  <para>First we will adjust the 32 bit ABI:</para>
 
-<screen><userinput>perl -pi -e 's@ /tools/lib/ld.so.1@ /lib/ld.so.1 at g;' \
-    -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
-        `gcc --print-file specs`</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/adjusting.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
-<para>Second we will adjust the N32 ABI:</para>
+  <para>Second we will adjust the N32 ABI:</para>
 
 <screen><userinput>perl -pi -e 's@ /tools/lib32/ld.so.1@ /lib32/ld.so.1 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib32/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-<para>Third we will adjust the 64 bit ABI:</para>
+  <para>Third we will adjust the 64 bit ABI:</para>
 
 <screen><userinput>perl -pi -e 's@ /tools/lib64/ld.so.1@ /lib64/ld.so.1 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib64/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-  <para>It is a good idea to visually inspect the specs file to verify the
-  intended change was actually made.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
   <para>Note that <filename class="directory">/lib</filename>,
   <filename class="directory">/lib32</filename>, or
   <filename class="directory">/lib64</filename> is now the prefix
   of our dynamic linker.</para>
 
-<caution><para>It is imperative at this point to stop and ensure that
-the basic functions (compiling and linking) of the adjusted toolchain
-are working as expected. To do this, perform a sanity
-check:</para>
+  <caution>
 
-<para>For 32 bit ABI:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
+    <para>For 32 bit ABI:</para>
+
 <screen><userinput>echo 'main(){}' > dummy.c
 cc ${BUILD32} dummy.c
 readelf -l a.out | grep ': /lib'</userinput></screen>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<para>For N32 ABI:</para>
+    <para>For N32 ABI:</para>
 
 <screen><userinput>echo 'main(){}' > dummy.c
 cc ${BUILDN32} dummy.c
 readelf -l a.out | grep ': /lib'</userinput></screen>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><computeroutput>[Requesting program interpreter: /lib32/ld.so.1]</computeroutput></screen>
 
-<para>For 64 bit ABI:</para>
+    <para>For 64 bit ABI:</para>
 
 <screen><userinput>echo 'main(){}' > dummy.c
 cc ${BUILD64} dummy.c
 readelf -l a.out | grep ': /lib'</userinput></screen>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><computeroutput>[Requesting program interpreter: /lib64/ld.so.1]</computeroutput></screen>
 
-<para>Note that <filename class="directory">/lib</filename>,
-<filename class="directory">/lib32</filename> or
-<filename class="directory">/lib64</filename> is now the prefix
-of our dynamic linker.</para>
+    <para>Note that <filename class="directory">/lib</filename>,
+    <filename class="directory">/lib32</filename> or
+    <filename class="directory">/lib64</filename> is now the prefix
+    of our dynamic linker.</para>
 
-<para>If the output does not appear as shown above or is not received
-at all, then something is seriously wrong. Investigate and retrace the
-steps to find out where the problem is and correct it. The most likely
-reason is that something went wrong with the specs file amendment
-above. Any issues will need to be resolved before continuing on with
-the process.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<para>Once everything is working correctly, clean up the test
-files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>rm dummy.c a.out</userinput></screen></caution>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
+  </caution>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/mips64-64/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64-64/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/mips64-64/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -10,74 +10,77 @@
 
   <title>Adjusting the Toolchain</title>
 
-  <para>Now we amend the GCC specs file so that it points to the new
-  dynamic linker. A <command>perl</command> command accomplishes this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/adjusting.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-  <warning>
-    <para><emphasis>Do not</emphasis> run the following command more than
-    once, it will adversely affect the outcome of software built after
-    this step.</para>
-  </warning>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/adjusting.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-<para>First we will adjust the 64 bit ABI:</para>
+  <para>First we will adjust the 64 bit ABI:</para>
 
-<screen><userinput>perl -pi -e 's@ /tools/lib/ld.so.1@ /lib/ld.so.1 at g;' \
-    -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
-        `gcc --print-file specs`</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/adjusting.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
-<para>Second we will adjust the 32 ABI:</para>
+  <para>Second we will adjust the 32 ABI:</para>
 
 <screen><userinput>perl -pi -e 's@ /tools/lib32/ld.so.1@ /lib32/ld.so.1 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib32/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-<para>Third we will adjust the N32 bit ABI:</para>
+  <para>Third we will adjust the N32 bit ABI:</para>
 
 <screen><userinput>perl -pi -e 's@ /tools/lib64/ld.so.1@ /lib64/ld.so.1 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib64/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-  <para>It is a good idea to visually inspect the specs file to verify the
-  intended change was actually made.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
   <para>Note that <filename class="directory">/lib</filename>,
   <filename class="directory">/lib32</filename>, or
   <filename class="directory">/lib64</filename> is now the prefix
   of our dynamic linker.</para>
 
-<caution><para>It is imperative at this point to stop and ensure that
-the basic functions (compiling and linking) of the adjusted toolchain
-are working as expected. We are only going to test the 64 bit ABI, since
-we have not built the 32 bit ABI's. To do this, perform a sanity
-check:</para>
+  <caution>
 
-<para>For 64 bit ABI:</para>
+    <para>It is imperative at this point to stop and ensure that
+    the basic functions (compiling and linking) of the adjusted toolchain
+    are working as expected. Since we are doing a 64 bit only build, we
+    will only test the 64 bit ABI. To do this, perform a sanity
+    check:</para>
 
-<screen><userinput>echo 'main(){}' > dummy.c
-cc dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<para>Note that <filename class="directory">/lib</filename>,
-<filename class="directory">/lib32</filename> or
-<filename class="directory">/lib64</filename> is now the prefix
-of our dynamic linker.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<para>If the output does not appear as shown above or is not received
-at all, then something is seriously wrong. Investigate and retrace the
-steps to find out where the problem is and correct it. The most likely
-reason is that something went wrong with the specs file amendment
-above. Any issues will need to be resolved before continuing on with
-the process.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<para>Once everything is working correctly, clean up the test
-files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>rm dummy.c a.out</userinput></screen></caution>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
+  </caution>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/multilib/autoconf.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/autoconf.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/multilib/autoconf.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -42,21 +42,31 @@
   <sect2 role="installation">
     <title>Installation of Autoconf</title>
 
-    <para>Prepare Autoconf for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/automake.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/automake.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/multilib/automake.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -42,21 +42,31 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
-    <para>Prepare Automake for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/automake.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/less.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/less.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/multilib/less.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -42,22 +42,32 @@
   <sect2 role="installation">
     <title>Installation of Less</title>
 
-    <para>Prepare Less for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/less.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --bindir=/bin --sysconfdir=/etc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/less.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/less.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/less.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/less.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/less.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/ppc/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/ppc/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/ppc/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -11,45 +11,56 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/adjusting.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
+  xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/adjusting.xml"
-  xpointer="xpointer(/sect1/warning[1])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
-
 <screen><userinput>perl -pi -e 's@ /tools/lib/ld.so.1@ /lib/ld.so.1 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
     `gcc --print-file specs`</userinput></screen>
 
-<caution><para>It is imperative at this point to stop and ensure that
-the basic functions (compiling and linking) of the adjusted toolchain
-are working as expected. To do this, perform a sanity
-check:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>echo 'main(){}' > dummy.c
-cc dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+  <caution>
 
-<screen><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<para>Note that <filename class="directory">/lib</filename> is now
-the prefix of our dynamic linker.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<para>If the output does not appear as shown above or is not received
-at all, then something is seriously wrong. Investigate and retrace the
-steps to find out where the problem is and correct it. The most likely
-reason is that something went wrong with the specs file amendment
-above. Any issues will need to be resolved before continuing on with
-the process.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<para>Once everything is working correctly, clean up the test
-files:</para>
+<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
 
-<screen><userinput>rm dummy.c a.out</userinput></screen></caution>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+  </caution>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/sparc/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/sparc/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -5,6 +5,66 @@
   %general-entities;
 ]>
 
+<sect1 id="ch-system-adjusting">
+  <?dbhtml filename="adjusting.html"?>
+
+  <title>Adjusting the Toolchain</title>
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../x86/adjusting.xml"
-  xpointer="xpointer(/sect1)"/>
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+  <caution>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+  </caution>
+
+</sect1>
+

Modified: branches/cross-lfs/BOOK/final-system/sparc64/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/sparc64/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -5,6 +5,87 @@
   %general-entities;
 ]>
 
+<sect1 id="ch-system-adjusting">
+  <?dbhtml filename="adjusting.html"?>
+
+  <title>Adjusting the Toolchain</title>
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86_64/adjusting.xml"
-  xpointer="xpointer(/sect1)"/>
+  href="../sparc/adjusting.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/adjusting.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
+
+  <para>First we will adjust the 32 bit ABI:</para>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/adjusting.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <para>Second we will adjust the 64 bit ABI:</para>
+
+<screen><userinput>perl -pi -e 's@ /tools/lib64/ld-linux-sparc-64.so.2@ /lib64/ld-linux-sparc-64.so.2 at g;' \
+    -e 's@\*startfile_prefix_spec:\n@$_/usr/lib64/ @g;' \
+        `gcc --print-file specs`</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <para>Note that <filename class="directory">/lib</filename> or
+  <filename class="directory">/lib64</filename> is now the prefix
+  of our dynamic linker.</para>
+
+  <caution>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <para>For 32 bit ABI:</para>
+
+<screen><userinput>echo 'main(){}' > dummy.c
+cc ${BUILD32} dummy.c
+readelf -l a.out | grep ': /lib'</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <para>For 64 bit ABI:</para>
+
+<screen><userinput>echo 'main(){}' > dummy.c
+cc ${BUILD64} dummy.c
+readelf -l a.out | grep ': /lib'</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-sparc-64.so.2]</computeroutput></screen>
+
+    <para>Note that <filename class="directory">/lib</filename> or
+    <filename class="directory">/lib64</filename> is now the prefix
+    of our dynamic linker.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+  </caution>
+
+</sect1>

Modified: branches/cross-lfs/BOOK/final-system/sparc64-64/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64-64/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/sparc64-64/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -10,67 +10,68 @@
 
   <title>Adjusting the Toolchain</title>
 
-  <para>Now we amend the GCC specs file so that it points to the new
-  dynamic linker. A <command>perl</command> command accomplishes this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/adjusting.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-  <warning>
-    <para><emphasis>Do not</emphasis> run the following command more than
-    once, it will adversely affect the outcome of software built after
-    this step.</para>
-  </warning>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/adjusting.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-<para>First we will adjust the 64 bit ABI:</para>
+  <para>First we will adjust the 32 bit ABI:</para>
 
-<screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2 at g;' \
-    -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
+<screen><userinput>perl -pi -e 's@ /tools/lib32/ld-linux.so.2@ /lib32/ld-linux.so.2 at g;' \
+    -e 's@\*startfile_prefix_spec:\n@$_/usr/lib32/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-<para>Second we will adjust the 32 ABI:</para>
+  <para>Second we will adjust the 64 bit ABI:</para>
 
-<screen><userinput>perl -pi -e 's@ /tools/lib32/ld-linux.so.2@ /lib32/ld-linux.so.2 at g;' \
-    -e 's@\*startfile_prefix_spec:\n@$_/usr/lib32/ @g;' \
+<screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux-sparc-64.so.2@ /lib/ld-linux-sparc-64.so.2 at g;' \
+    -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-  <para>It is a good idea to visually inspect the specs file to verify the
-  intended change was actually made.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
   <para>Note that <filename class="directory">/lib</filename> or
   <filename class="directory">/lib32</filename> is now the prefix
   of our dynamic linker.</para>
 
-<caution><para>It is imperative at this point to stop and ensure that
-the basic functions (compiling and linking) of the adjusted toolchain
-are working as expected. We are only going to test the 64 bit ABI, since
-we have not built the 32 bit ABI's. To do this, perform a sanity
-check:</para>
+  <caution>
 
-<para>For 64 bit ABI:</para>
+    <para>It is imperative at this point to stop and ensure that
+    the basic functions (compiling and linking) of the adjusted toolchain
+    are working as expected. Since we are doing a 64 bit only build, we
+    will only test the 64 bit ABI. To do this, perform a sanity
+    check:</para>
 
-<screen><userinput>echo 'main(){}' > dummy.c
-cc dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
+<screen><computeroutput>[Requesting program interpreter: /lib/ld-linux-sparc-64.so.2]</computeroutput></screen>
 
-<para>Note that <filename class="directory">/lib</filename>,
-<filename class="directory">/lib32</filename> or
-<filename class="directory">/lib64</filename> is now the prefix
-of our dynamic linker.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<para>If the output does not appear as shown above or is not received
-at all, then something is seriously wrong. Investigate and retrace the
-steps to find out where the problem is and correct it. The most likely
-reason is that something went wrong with the specs file amendment
-above. Any issues will need to be resolved before continuing on with
-the process.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<para>Once everything is working correctly, clean up the test
-files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>rm dummy.c a.out</userinput></screen></caution>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
+  </caution>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/x86/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/x86/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -10,53 +10,56 @@
 
   <title>Adjusting the Toolchain</title>
 
-  <para>Now we amend the GCC specs file so that it points to the new
+  <para os="a">Now we amend the GCC specs file so that it points to the new
   dynamic linker. A <command>perl</command> command accomplishes this:</para>
 
-  <warning>
+  <warning os="b">
     <para><emphasis>Do not</emphasis> run the following command more than
     once, it will adversely affect the outcome of software built after
     this step.</para>
   </warning>
 
-<screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2 at g;' \
+<screen os="c"><userinput>perl -pi -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-  <para>It is a good idea to visually inspect the specs file to verify the
+  <para os="d">It is a good idea to visually inspect the specs file to verify the
   intended change was actually made.</para>
 
-  <para>Note that <filename class="directory">/lib</filename> is now
+  <para os="e">Note that <filename class="directory">/lib</filename> is now
   the prefix of our dynamic linker.</para>
 
-<caution><para>It is imperative at this point to stop and ensure that
-the basic functions (compiling and linking) of the adjusted toolchain
-are working as expected. To do this, perform a sanity
-check:</para>
+  <caution>
 
-<screen><userinput>echo 'main(){}' > dummy.c
+    <para os="f">It is imperative at this point to stop and ensure that
+    the basic functions (compiling and linking) of the adjusted toolchain
+    are working as expected. To do this, perform a sanity
+    check:</para>
+
+<screen os="g"><userinput>echo 'main(){}' > dummy.c
 cc dummy.c
 readelf -l a.out | grep ': /lib'</userinput></screen>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <para os="h">If everything is working correctly, there should be no errors,
+    and the output of the last command will be:</para>
 
-<screen><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
+<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
 
-<para>Note that <filename class="directory">/lib</filename> is now
-the prefix of our dynamic linker.</para>
+    <para os="j">Note that <filename class="directory">/lib</filename> is now
+    the prefix of our dynamic linker.</para>
 
-<para>If the output does not appear as shown above or is not received
-at all, then something is seriously wrong. Investigate and retrace the
-steps to find out where the problem is and correct it. The most likely
-reason is that something went wrong with the specs file amendment
-above. Any issues will need to be resolved before continuing on with
-the process.</para>
+    <para os="k">If the output does not appear as shown above or is not received
+    at all, then something is seriously wrong. Investigate and retrace the
+    steps to find out where the problem is and correct it. The most likely
+    reason is that something went wrong with the specs file amendment
+    above. Any issues will need to be resolved before continuing on with
+    the process.</para>
 
-<para>Once everything is working correctly, clean up the test
-files:</para>
+    <para os="l">Once everything is working correctly, clean up the test
+    files:</para>
 
-<screen><userinput>rm dummy.c a.out</userinput></screen></caution>
+<screen os="m"><userinput>rm dummy.c a.out</userinput></screen>
 
+  </caution>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/x86_64/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/x86_64/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -10,78 +10,82 @@
 
   <title>Adjusting the Toolchain</title>
 
-  <para>Now we amend the GCC specs file so that it points to the new
-  dynamic linker. A <command>perl</command> command accomplishes this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-  <warning>
-    <para><emphasis>Do not</emphasis> run the following command more than
-    once, it will adversely affect the outcome of software built after
-    this step.</para>
-  </warning>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-<para>First we will adjust the 32 bit ABI:</para>
+  <para>First we will adjust the 32 bit ABI:</para>
 
-<screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2 at g;' \
-    -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
-        `gcc --print-file specs`</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
-<para>Second we will adjust the 64 bit ABI:</para>
+  <para>Second we will adjust the 64 bit ABI:</para>
 
 <screen><userinput>perl -pi -e 's@ /tools/lib64/ld-linux-x86-64.so.2@ /lib64/ld-linux-x86-64.so.2 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib64/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-  <para>It is a good idea to visually inspect the specs file to verify the
-  intended change was actually made.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
   <para>Note that <filename class="directory">/lib</filename> or
   <filename class="directory">/lib64</filename> is now the prefix
   of our dynamic linker.</para>
 
-<caution><para>It is imperative at this point to stop and ensure that
-the basic functions (compiling and linking) of the adjusted toolchain
-are working as expected. To do this, perform a sanity
-check:</para>
+  <caution>
 
-<para>For 32 bit ABI:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
+    <para>For 32 bit ABI:</para>
+
 <screen><userinput>echo 'main(){}' > dummy.c
 cc ${BUILD32} dummy.c
 readelf -l a.out | grep ': /lib'</userinput></screen>
-<para>For 32bit:</para>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<para>For 64 bit ABI:</para>
+    <para>For 64 bit ABI:</para>
 
 <screen><userinput>echo 'main(){}' > dummy.c
 cc ${BUILD64} dummy.c
 readelf -l a.out | grep ': /lib'</userinput></screen>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
 
-<para>Note that <filename class="directory">/lib</filename> or
-<filename class="directory">/lib64</filename> is now the prefix
-of our dynamic linker.</para>
+    <para>Note that <filename class="directory">/lib</filename> or
+    <filename class="directory">/lib64</filename> is now the prefix
+    of our dynamic linker.</para>
 
-<para>If the output does not appear as shown above or is not received
-at all, then something is seriously wrong. Investigate and retrace the
-steps to find out where the problem is and correct it. The most likely
-reason is that something went wrong with the specs file amendment
-above. Any issues will need to be resolved before continuing on with
-the process.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<para>Once everything is working correctly, clean up the test
-files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>rm dummy.c a.out</userinput></screen></caution>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
+  </caution>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/x86_64-64/adjusting.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64-64/adjusting.xml	2005-08-23 05:36:58 UTC (rev 6742)
+++ branches/cross-lfs/BOOK/final-system/x86_64-64/adjusting.xml	2005-08-23 19:14:42 UTC (rev 6743)
@@ -10,66 +10,68 @@
 
   <title>Adjusting the Toolchain</title>
 
-  <para>Now we amend the GCC specs file so that it points to the new
-  dynamic linker. A <command>perl</command> command accomplishes this:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-  <warning>
-    <para><emphasis>Do not</emphasis> run the following command more than
-    once, it will adversely affect the outcome of software built after
-    this step.</para>
-  </warning>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-<para>First we will adjust the 32 bit ABI:</para>
+  <para>First we will adjust the 32 bit ABI:</para>
 
 <screen><userinput>perl -pi -e 's@ /tools/lib32/ld-linux.so.2@ /lib32/ld-linux.so.2 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib32/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-<para>Second we will adjust the 64 bit ABI:</para>
+  <para>Second we will adjust the 64 bit ABI:</para>
 
 <screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux-x86-64.so.2@ /lib/ld-linux-x86-64.so.2 at g;' \
     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' \
         `gcc --print-file specs`</userinput></screen>
 
-  <para>It is a good idea to visually inspect the specs file to verify the
-  intended change was actually made.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../x86/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
   <para>Note that <filename class="directory">/lib</filename> or
   <filename class="directory">/lib32</filename> is now the prefix
   of our dynamic linker.</para>
 
-<caution><para>It is imperative at this point to stop and ensure that
-the basic functions (compiling and linking) of the adjusted toolchain
-are working as expected. Since we are doing a 64 bit only build, we
-will only test the 64 bit ABI. To do this, perform a sanity
-check:</para>
+  <caution>
 
-<para>For 64 bit ABI:</para>
+    <para>It is imperative at this point to stop and ensure that
+    the basic functions (compiling and linking) of the adjusted toolchain
+    are working as expected. Since we are doing a 64 bit only build, we
+    will only test the 64 bit ABI. To do this, perform a sanity
+    check:</para>
 
-<screen><userinput>echo 'main(){}' > dummy.c
-cc dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<para>If everything is working correctly, there should be no errors,
-and the output of the last command will be (allowing for
-platform-specific differences in dynamic linker name):</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><computeroutput>[Requesting program interpreter: /lib/ld-linux-x86-64.so.2]</computeroutput></screen>
 
-<para>Note that <filename class="directory">/lib</filename> or
-<filename class="directory">/lib64</filename> is now the prefix
-of our dynamic linker.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<para>If the output does not appear as shown above or is not received
-at all, then something is seriously wrong. Investigate and retrace the
-steps to find out where the problem is and correct it. The most likely
-reason is that something went wrong with the specs file amendment
-above. Any issues will need to be resolved before continuing on with
-the process.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<para>Once everything is working correctly, clean up the test
-files:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>rm dummy.c a.out</userinput></screen></caution>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
+  </caution>
+
 </sect1>




More information about the lfs-book mailing list