Author: manuel
Date: 2005-06-25 06:03:32 -0600 (Sat, 25 Jun 2005)
New Revision: 6161

Modified:
   branches/cross-lfs/BOOK/cross-tools/mips/gcc-final.xml
   branches/cross-lfs/BOOK/cross-tools/mips/gcc-no-threads.xml
   branches/cross-lfs/BOOK/cross-tools/mips/gcc-shared.xml
   branches/cross-lfs/BOOK/cross-tools/mips/gcc-static.xml
   branches/cross-lfs/BOOK/cross-tools/mips/glibc-headers.xml
   branches/cross-lfs/BOOK/cross-tools/mips/glibc-startfiles.xml
   branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml
   branches/cross-lfs/BOOK/cross-tools/x86/gcc-final.xml
   branches/cross-lfs/BOOK/cross-tools/x86/gcc-shared.xml
   branches/cross-lfs/BOOK/cross-tools/x86/gcc-static.xml
   branches/cross-lfs/BOOK/cross-tools/x86/glibc-startfiles.xml
   branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml
Log:
Re-done the Xinclude stuff in cross-tools/x86 and cross-tools/mips.
Making it more arch and chapter auto-contained.
Avoiding the use of range-to function until hava a libxml2 bug-free.
At this momment the HTML output for other archs have some small bugs.

Modified: branches/cross-lfs/BOOK/cross-tools/mips/gcc-final.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/gcc-final.xml      2005-06-25 
11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/mips/gcc-final.xml      2005-06-25 
12:03:32 UTC (rev 6161)
@@ -44,9 +44,73 @@
     <title>Installation of GCC Cross Compiler</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../mips/gcc-shared.xml"
-    xpointer="xpointer(//[EMAIL 
PROTECTED]'installation']/para[1]/range-to(//[EMAIL 
PROTECTED]'installation']/para[9]))"/>
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[6])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[6])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[7])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[7])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/important[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[5])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[5])"/>
+
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \

Modified: branches/cross-lfs/BOOK/cross-tools/mips/gcc-no-threads.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/gcc-no-threads.xml 2005-06-25 
11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/mips/gcc-no-threads.xml 2005-06-25 
12:03:32 UTC (rev 6161)
@@ -46,8 +46,48 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="../x86/gcc-static.xml"
-    xpointer="xpointer(//[EMAIL 
PROTECTED]'installation']/para[1]/range-to(//[EMAIL 
PROTECTED]'installation']/para[6]))"/>
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/important[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(id('install-gcc')/para[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(id('install-gcc')/screen[3])"/>
+
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \

Modified: branches/cross-lfs/BOOK/cross-tools/mips/gcc-shared.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/gcc-shared.xml     2005-06-25 
11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/mips/gcc-shared.xml     2005-06-25 
12:03:32 UTC (rev 6161)
@@ -44,9 +44,73 @@
     <title>Installation of Cross GCC with Shared libgcc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="../x86/gcc-shared.xml"
-    xpointer="xpointer(//[EMAIL 
PROTECTED]'installation']/para[1]/range-to(//[EMAIL 
PROTECTED]'installation']/para[9]))"/>
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[6])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[6])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[7])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="../x86/gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[7])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/important[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[5])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[5])"/>
+
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \

Modified: branches/cross-lfs/BOOK/cross-tools/mips/gcc-static.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/gcc-static.xml     2005-06-25 
11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/mips/gcc-static.xml     2005-06-25 
12:03:32 UTC (rev 6161)
@@ -44,9 +44,49 @@
     <title>Installation of Cross GCC Compiler with Static libgcc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../mips/gcc-no-threads.xml"
-    xpointer="xpointer(//[EMAIL 
PROTECTED]'installation']/para[1]/range-to(//[EMAIL 
PROTECTED]'installation']/para[6]))"/>
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/important[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[5])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-no-threads.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[5])"/>
+
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \

Modified: branches/cross-lfs/BOOK/cross-tools/mips/glibc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/glibc-headers.xml  2005-06-25 
11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/mips/glibc-headers.xml  2005-06-25 
12:03:32 UTC (rev 6161)
@@ -150,8 +150,6 @@
 cp ../glibc-&glibc-version;/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h 
/tools/include/bits/
 cp ../glibc-&glibc-version;/linuxthreads/sysdeps/pthread/bits/initspin.h 
/tools/include/bits/</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/cross-tools/mips/glibc-startfiles.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/glibc-startfiles.xml       
2005-06-25 11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/mips/glibc-startfiles.xml       
2005-06-25 12:03:32 UTC (rev 6161)
@@ -44,32 +44,32 @@
 <title>Installation of Glibc Startfiles</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
+    href="glibc-headers.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[5])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
+    href="glibc-headers.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[2])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
 
     <para>To create Linuxthread Startfiles use the following
     configure line:</para>
@@ -121,8 +121,6 @@
 <screen><userinput>install -d /tools/lib
 cp -fp csu/crt[i1n].o /tools/lib</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml  2005-06-25 11:24:19 UTC 
(rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/mips/glibc.xml  2005-06-25 12:03:32 UTC 
(rev 6161)
@@ -48,32 +48,32 @@
     xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
+    href="glibc-headers.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[5])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/mips/glibc.xml"
+    href="glibc-headers.xml"
     xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[2])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
 
 <para>Next, prepare Glibc for compilation:</para>
 
@@ -105,8 +105,6 @@
 
 <screen><userinput>make install</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86/gcc-final.xml       2005-06-25 
11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/x86/gcc-final.xml       2005-06-25 
12:03:32 UTC (rev 6161)
@@ -44,9 +44,73 @@
     <title>Installation of GCC Cross Compiler</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[2])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="gcc-shared.xml"
-    xpointer="xpointer(//[EMAIL 
PROTECTED]'installation']/para[1]/range-to(//[EMAIL 
PROTECTED]'installation']/para[9]))"/>
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[3])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[4])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[6])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[6])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[7])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-shared.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[7])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/important[1])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[5])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[5])"/>
+
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
@@ -108,8 +172,6 @@
 
 <screen><userinput>make install</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/cross-tools/x86/gcc-shared.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86/gcc-shared.xml      2005-06-25 
11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/x86/gcc-shared.xml      2005-06-25 
12:03:32 UTC (rev 6161)
@@ -99,15 +99,13 @@
     xpointer="xpointer(//[EMAIL PROTECTED]'installation']/important[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(id('install-gcc')/para[4])"/>
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[5])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(id('install-gcc')/screen[3])"/>
+    href="gcc-static.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[5])"/>
 
-    <para/>
-
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
@@ -140,8 +138,6 @@
 
 <screen><userinput>make install-gcc</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/cross-tools/x86/gcc-static.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86/gcc-static.xml      2005-06-25 
11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/x86/gcc-static.xml      2005-06-25 
12:03:32 UTC (rev 6161)
@@ -79,8 +79,6 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(id('install-gcc')/screen[3])"/>
 
-    <para/>
-
     <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
@@ -134,8 +132,6 @@
 
 <screen><userinput>make install-gcc</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/cross-tools/x86/glibc-startfiles.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86/glibc-startfiles.xml        
2005-06-25 11:24:19 UTC (rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/x86/glibc-startfiles.xml        
2005-06-25 12:03:32 UTC (rev 6161)
@@ -44,12 +44,12 @@
     <title>Installation of Glibc Startfiles</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
 
     <para>For NPTL enabled systems we will need to add the following
     lines to <filename>config.cache</filename>:</para>
@@ -158,8 +158,6 @@
 <screen><userinput>install -d /tools/lib
 cp -fp csu/crt[i1n].o /tools/lib</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml   2005-06-25 11:24:19 UTC 
(rev 6160)
+++ branches/cross-lfs/BOOK/cross-tools/x86/glibc.xml   2005-06-25 12:03:32 UTC 
(rev 6161)
@@ -48,12 +48,12 @@
     risk.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/para[4])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/para[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(id('install-glibc')/screen[2])"/>
+    href="glibc-headers.xml"
+    xpointer="xpointer(//[EMAIL PROTECTED]'installation']/screen[1])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
     href="glibc-startfiles.xml"

-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page

Reply via email to