r6708 - in branches/cross-lfs/BOOK: final-system/common final-system/mips final-system/mips64 final-system/multilib temp-system/64 temp-system/common temp-system/mips temp-system/mips64 temp-system/mips64-64 temp-system/multilib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Aug 18 11:46:15 PDT 2005


Author: manuel
Date: 2005-08-18 12:46:13 -0600 (Thu, 18 Aug 2005)
New Revision: 6708

Modified:
   branches/cross-lfs/BOOK/final-system/common/flex.xml
   branches/cross-lfs/BOOK/final-system/common/grep.xml
   branches/cross-lfs/BOOK/final-system/mips/grep.xml
   branches/cross-lfs/BOOK/final-system/mips64/grep.xml
   branches/cross-lfs/BOOK/final-system/multilib/flex-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/flex-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/flex.xml
   branches/cross-lfs/BOOK/final-system/multilib/grep.xml
   branches/cross-lfs/BOOK/temp-system/64/flex.xml
   branches/cross-lfs/BOOK/temp-system/64/gettext.xml
   branches/cross-lfs/BOOK/temp-system/64/grep.xml
   branches/cross-lfs/BOOK/temp-system/common/flex.xml
   branches/cross-lfs/BOOK/temp-system/common/gettext.xml
   branches/cross-lfs/BOOK/temp-system/common/grep.xml
   branches/cross-lfs/BOOK/temp-system/mips/grep.xml
   branches/cross-lfs/BOOK/temp-system/mips64-64/grep.xml
   branches/cross-lfs/BOOK/temp-system/mips64/grep.xml
   branches/cross-lfs/BOOK/temp-system/multilib/flex.xml
   branches/cross-lfs/BOOK/temp-system/multilib/gettext-64bit.xml
   branches/cross-lfs/BOOK/temp-system/multilib/gettext-n32.xml
   branches/cross-lfs/BOOK/temp-system/multilib/gettext.xml
   branches/cross-lfs/BOOK/temp-system/multilib/grep.xml
Log:
Xinclude redo up to Grep.

Modified: branches/cross-lfs/BOOK/final-system/common/flex.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/flex.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/final-system/common/flex.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -46,47 +46,47 @@
   <sect2 id="install-flex" role="installation">
     <title>Installation of Flex</title>
 
-    <para>Flex contains several known bugs. Fix these with the following
+    <para os="a">Flex contains several known bugs. Fix these with the following
     patch:</para>
 
-<screen><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
 
-    <para>The GNU autotools detects that the Flex source code has been
+    <para os="c">The GNU autotools detects that the Flex source code has been
     modified by the previous patch and tries to update the man page
     accordingly. This does not work correctly on many systems, and the
     default page is fine, so make sure it does not get regenerated:</para>
 
-<screen><userinput>touch doc/flex.1</userinput></screen>
+<screen os="d"><userinput>touch doc/flex.1</userinput></screen>
 
-    <para>Prepare Flex for compilation:</para>
+    <para os="e">Prepare Flex for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="f">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue:
+    <para os="h">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="i">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="j"><userinput>make install</userinput></screen>
 
-    <para>There are some packages that expect to find the
+    <para os="k">There are some packages that expect to find the
     <filename class="libraryfile">lex</filename> library in <filename
     class="directory">/usr/lib</filename>. Create a symlink to account for
     this:</para>
 
-<screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
+<screen os="l"><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
 
-    <para>A few programs do not know about <command>flex</command> yet and
+    <para os="m">A few programs do not know about <command>flex</command> yet and
     try to run its predecessor, <command>lex</command>. To support those
     programs, create a wrapper script named <filename>lex</filename> that
     calls <filename>flex</filename> in <command>lex</command> emulation
     mode:</para>
 
-<screen><userinput>cat > /usr/bin/lex << "EOF"
+<screen os="n"><userinput>cat > /usr/bin/lex << "EOF"
 <literal>#!/bin/sh
 # Begin /usr/bin/lex
 

Modified: branches/cross-lfs/BOOK/final-system/common/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/final-system/common/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -46,23 +46,21 @@
   <sect2 id="install-grep" role="installation">
     <title>Installation of Grep</title>
 
-    <para>Prepare Grep for compilation:</para>
+    <para os="a">Prepare Grep for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
 
-    <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>To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 id="contents-grep" role="content">

Modified: branches/cross-lfs/BOOK/final-system/mips/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/final-system/mips/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -16,22 +16,65 @@
     <primary sortas="a-Grep">Grep</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/grep.xml"
-  xpointer="xpointer(id('package-grep'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(id('package-grep')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(id('package-grep')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
-    <para>This patch updates <filename>config.guess</filename> and
+    <para os="ba">This patch updates <filename>config.guess</filename> and
     <filename>config.sub</filename> for MIPS processors.</para>
 
-<screen><userinput>patch -Np1 -i ../&grep-mips_update-patch;</userinput></screen>
+<screen os="bb"><userinput>patch -Np1 -i ../&grep-mips_update-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(id('install-grep')/para[1]/range-to(id('install-grep')/para[last()]))"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
 </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/mips64/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/final-system/mips64/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,21 +44,40 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
-    <para>Prepare Grep for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/grep.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(id('install-grep')/para[2]/range-to(id('install-grep')/para[last()]))"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
 </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/flex-64bit.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/final-system/multilib/flex-64bit.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,34 +44,46 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[2])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Prepare Flex for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
+<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --libdir=/usr/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <para>There are some packages that expect to find the
     <filename class="libraryfile">lex</filename> library in <filename
@@ -82,11 +94,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[8])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[7])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/flex-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/flex-n32.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/final-system/multilib/flex-n32.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,33 +44,45 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[2])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Prepare Flex for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --libdir=/usr/lib64</userinput></screen>
+<screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+   --libdir=/usr/lib32</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
 <screen><userinput>make libfl.a</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
     <para>There are some packages that expect to find the
     <filename class="libraryfile">lex</filename> library in <filename
     class="directory">/usr/lib32</filename>. Create a symlink to account for
@@ -78,14 +90,6 @@
 
 <screen><userinput>ln -s libfl.a /usr/lib32/libl.a</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[8])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[7])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/final-system/multilib/flex.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/flex.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/final-system/multilib/flex.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,41 +44,51 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[2])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Prepare Flex for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
 <screen><userinput>make libfl.a</userinput></screen>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib</filename>. Create a symlink to account for
-    this:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/final-system/multilib/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -42,24 +42,33 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
-    <para>Prepare Grep for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin --with-included-regex</userinput></screen>
+<screen os="aa"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+   --bindir=/bin</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/temp-system/64/flex.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/flex.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/64/flex.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,33 +44,43 @@
     <title>Installation of Flex</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[1])"/>
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[1])"/>
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[2])"/>
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[2])"/>
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Now prepare Flex for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-nls</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/64/gettext.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/gettext.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/64/gettext.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -45,11 +45,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <para>Prepare Gettext for compilation:</para>
 
@@ -60,7 +60,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/temp-system/64/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/64/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -43,22 +43,32 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
-    <para>Prepare Grep for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/flex.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/flex.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/common/flex.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -45,32 +45,42 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[2])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Now prepare Flex for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/flex.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-nls</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/flex.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/flex.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/flex.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/gettext.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/gettext.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/common/gettext.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -43,10 +43,10 @@
   <sect2 role="installation">
     <title>Installation of Gettext</title>
 
-    <para>Gettext has an issue with cross-compiling where it
+    <para os="a">Gettext has an issue with cross-compiling where it
     can't find getline. So we fix it here:</para>
 
-<screen><userinput>echo "am_cv_func_working_getline=yes" >> config.cache</userinput></screen>
+<screen os="b"><userinput>echo "am_cv_func_working_getline=yes" >> config.cache</userinput></screen>
 
     <para>Prepare Gettext for compilation:</para>
 
@@ -54,7 +54,7 @@
    --host=${LFS_TARGET} --disable-libasprintf \
    --without-csharp --cache-file=config.cache</userinput></screen>
 
-    <variablelist>
+    <variablelist os="c">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>

Modified: branches/cross-lfs/BOOK/temp-system/common/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/common/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -43,12 +43,14 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
-    <para>Prepare Grep for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/grep.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
 
-    <variablelist>
+    <variablelist os="ca">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -63,13 +65,21 @@
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/mips/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/mips/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/mips/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -45,28 +45,38 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
-    <para>Prepare Grep for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/mips64/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/mips64/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/mips64/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,29 +44,39 @@
     <title>Installation of Grep</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../mips/grep.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../mips/grep.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
-    <para>Prepare Grep for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/mips64-64/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/mips64-64/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/mips64-64/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,29 +44,39 @@
     <title>Installation of Grep</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../mips/grep.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../mips/grep.xml"
+    xpointer="xpointer(//*[@os='bb'])"/>
 
-    <para>Prepare Grep for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/flex.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/flex.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/multilib/flex.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,33 +44,43 @@
     <title>Installation of Flex</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[1])"/>
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[1])"/>
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/para[2])"/>
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(id('install-flex')/screen[2])"/>
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Now prepare Flex for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-nls --libdir=/tools/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/flex.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/gettext-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/gettext-64bit.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/multilib/gettext-64bit.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,11 +44,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <para>Prepare Gettext for compilation:</para>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/gettext-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/gettext-n32.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/multilib/gettext-n32.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -44,11 +44,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <para>Prepare Gettext for compilation:</para>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/gettext.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/gettext.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/multilib/gettext.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -45,11 +45,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <para>Prepare Gettext for compilation:</para>
 
@@ -60,7 +60,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/grep.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/grep.xml	2005-08-18 17:26:37 UTC (rev 6707)
+++ branches/cross-lfs/BOOK/temp-system/multilib/grep.xml	2005-08-18 18:46:13 UTC (rev 6708)
@@ -43,22 +43,32 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
-    <para>Prepare Grep for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 




More information about the lfs-book mailing list