r6738 - in branches/cross-lfs/BOOK: boot/64 boot/common boot/multilib final-system/common final-system/multilib temp-system/64 temp-system/common temp-system/multilib temp-tools/common temp-tools/multilib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Aug 22 11:34:36 PDT 2005


Author: manuel
Date: 2005-08-22 12:34:33 -0600 (Mon, 22 Aug 2005)
New Revision: 6738

Modified:
   branches/cross-lfs/BOOK/boot/64/udev.xml
   branches/cross-lfs/BOOK/boot/common/udev.xml
   branches/cross-lfs/BOOK/boot/multilib/udev.xml
   branches/cross-lfs/BOOK/final-system/common/tar.xml
   branches/cross-lfs/BOOK/final-system/common/texinfo.xml
   branches/cross-lfs/BOOK/final-system/common/udev.xml
   branches/cross-lfs/BOOK/final-system/multilib/tar.xml
   branches/cross-lfs/BOOK/final-system/multilib/texinfo.xml
   branches/cross-lfs/BOOK/final-system/multilib/udev.xml
   branches/cross-lfs/BOOK/temp-system/64/tar.xml
   branches/cross-lfs/BOOK/temp-system/common/tar.xml
   branches/cross-lfs/BOOK/temp-system/multilib/tar.xml
   branches/cross-lfs/BOOK/temp-tools/common/texinfo.xml
   branches/cross-lfs/BOOK/temp-tools/multilib/texinfo.xml
Log:
Xinclude redo up to Udev.

Modified: branches/cross-lfs/BOOK/boot/64/udev.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/64/udev.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/boot/64/udev.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -43,22 +43,31 @@
   <sect2 role="installation">
     <title>Installation of Udev</title>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" udevdir=/dev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(id('install-udev')/variablelist[1])"/>
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make DESTDIR=${LFS} udevdir=/dev install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-    <para>Udev's configuration is far from ideal by default, so install
-    the configuration files here:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/common/udev.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/udev.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/boot/common/udev.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -43,22 +43,27 @@
   <sect2 role="installation">
     <title>Installation of Udev</title>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CROSS="${LFS_TARGET}-" CC="${CC}" LD="${CC}"  udevdir=/dev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/udev.xml"
-    xpointer="xpointer(id('install-udev')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make DESTDIR=${LFS} udevdir=/dev install</userinput></screen>
+<screen os="aa"><userinput>make DESTDIR=${LFS} udevdir=/dev install</userinput></screen>
 
-    <para>Udev's configuration is far from ideal by default, so install
-    the configuration files here:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
+<screen os="ab"><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/multilib/udev.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/udev.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/boot/multilib/udev.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -43,22 +43,31 @@
   <sect2 role="installation">
     <title>Installation of Udev</title>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" udevdir=/dev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(id('install-udev')/variablelist[1])"/>
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make DESTDIR=${LFS} udevdir=/dev install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-    <para>Udev's configuration is far from ideal by default, so install
-    the configuration files here:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/tar.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/tar.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/final-system/common/tar.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -45,25 +45,25 @@
   <sect2 id="install-tar" role="installation">
     <title>Installation of Tar</title>
 
-    <para>Tar has a bug when the <option>-S</option> option is used with files
-    larger than 4 GB. The following patch properly fixes this issue:</para>
+    <para os="a">Tar has a bug when the <option>-S</option> option is used with
+    files larger than 4 GB. The following patch properly fixes this issue:</para>
 
-<screen><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
 
-    <para>Prepare Tar for compilation:</para>
+    <para os="c">Prepare Tar for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue:
+    <para os="f">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/texinfo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/texinfo.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/final-system/common/texinfo.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -46,27 +46,27 @@
   <sect2 id="install-texinfo" role="installation">
     <title>Installation of Texinfo</title>
 
-    <para>Prepare Texinfo for compilation:</para>
+    <para os="a">Prepare Texinfo 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>To test the results, issue:
+    <para os="d">To test the results, issue:
     <userinput>make check</userinput>.</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>
 
-    <para>Optionally, install the components belonging in a TeX
+    <para os="g">Optionally, install the components belonging in a TeX
     installation:</para>
 
-<screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
+<screen os="h"><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
 
-    <variablelist>
+    <variablelist os="i">
       <title>The meaning of the make parameter:</title>
 
       <varlistentry>
@@ -77,25 +77,23 @@
           installed later.</para>
         </listitem>
       </varlistentry>
+
     </variablelist>
 
-
-    <para>The Info documentation system uses a plain text file to hold its list
-    of menu entries. The file is located at
+    <para os="j">The Info documentation system uses a plain text file to hold
+    its list of menu entries. The file is located at
     <filename>/usr/share/info/dir</filename>. Unfortunately, due to occasional
     problems in the Makefiles of various packages, it can sometimes get out of
     sync with the info pages installed on the system. If the
     <filename>/usr/share/info/dir</filename> file ever needs to be recreated,
     the following optional commands will accomplish the task:</para>
 
-<screen><userinput>cd /usr/share/info
+<screen os="k"><userinput>cd /usr/share/info
 rm dir
 for f in *
 do install-info $f dir 2>/dev/null
 done</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 id="contents-texinfo" role="content">

Modified: branches/cross-lfs/BOOK/final-system/common/udev.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/udev.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/final-system/common/udev.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -45,16 +45,16 @@
   <sect2 id="install-udev" role="installation">
     <title>Installation of Udev</title>
 
-    <para>Fix an incorrect assumption in the Udev testsuite regarding the
+    <para os="a">Fix an incorrect assumption in the Udev testsuite regarding the
     location of the <command>test</command> binary:</para>
 
-<screen><userinput>sed -i -e 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
+<screen os="b"><userinput>sed -i -e 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
 <screen><userinput>make udevdir=/dev</userinput></screen>
 
-    <variablelist>
+    <variablelist os="d">
       <title>The meaning of the make parameter:</title>
 
       <varlistentry>
@@ -64,24 +64,25 @@
           devices nodes are to be created.</para>
         </listitem>
       </varlistentry>
+
     </variablelist>
 
-    <para>To test the results, issue:
+    <para os="e">To test the results, issue:
     <userinput>make test</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen><userinput>make udevdir=/dev install</userinput></screen>
+<screen os="g"><userinput>make udevdir=/dev install</userinput></screen>
 
-    <para>Udev's configuration is far from ideal by default, so install
+    <para os="h">Udev's configuration is far from ideal by default, so install
     the configuration files here:</para>
 
-<screen><userinput>cp ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
+<screen os="i"><userinput>cp ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
-    <para>Run the <command>udevstart</command> program to create our full
+    <para os="j">Run the <command>udevstart</command> program to create our full
     complement of device nodes.</para>
 
-<screen><userinput>/sbin/udevstart</userinput></screen>
+<screen os="k"><userinput>/sbin/udevstart</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/tar.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/tar.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/final-system/multilib/tar.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -44,27 +44,38 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(id('install-tar')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(id('install-tar')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Tar for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/texinfo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/texinfo.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/final-system/multilib/texinfo.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -42,14 +42,52 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
-    <para>Prepare Texinfo for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"
-    xpointer="xpointer(id('install-texinfo')/para[2]/range-to(id('install-texinfo')/para[last()]))"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/multilib/udev.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/udev.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/final-system/multilib/udev.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -19,8 +19,9 @@
   <sect2 id="package-udev" role="package">
     <title/>
 
-    <para>The Udev package contains programs for dynamic creation of device
-    nodes.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(id('package-udev')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -32,57 +33,61 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(id('package-udev')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Coreutils and Make</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
-  <sect2 id="install-udev" role="installation">
+  <sect2 role="installation">
     <title>Installation of Udev</title>
 
-    <para>Fix an incorrect assumption in the Udev testsuite regarding the
-    location of the <command>test</command> binary:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>sed -i -e 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" udevdir=/dev</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the make parameter:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-      <varlistentry>
-      <term><parameter>udevdir=/dev</parameter></term>
-        <listitem>
-          <para>This tells <command>udev</command> in which directory
-          devices nodes are to be created.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make test</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make udevdir=/dev install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Udev's configuration is far from ideal by default, so install
-    the configuration files here:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>cp ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>Run the <command>udevstart</command> program to create our full
-    compliment of device nodes.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>/sbin/udevstart</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-udev" role="content">

Modified: branches/cross-lfs/BOOK/temp-system/64/tar.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/tar.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/temp-system/64/tar.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -45,24 +45,34 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Prepare Tar for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/tar.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/tar.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/temp-system/common/tar.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -43,23 +43,33 @@
   <sect2 role="installation">
     <title>Installation of Tar</title>
 
-    <para>Tar has an issue with cross-compiling where it
-    can't find getline. So we fix it here:</para>
+    <para os="aa">Tar has an issue with cross-compiling where it
+    can't find <function>getline</function>. So we fix it here:</para>
 
-<screen><userinput>echo "am_cv_func_working_getline=yes" >> config.cache</userinput></screen>
+<screen os="ab"><userinput>echo "am_cv_func_working_getline=yes" >> config.cache</userinput></screen>
 
-    <para>Prepare Tar for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/tar.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/tar.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/tar.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/tar.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/tar.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/tar.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/tar.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/temp-system/multilib/tar.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -45,24 +45,34 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tar.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Prepare Tar for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tar.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-tools/common/texinfo.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/common/texinfo.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/temp-tools/common/texinfo.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -43,21 +43,28 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
-    <para>Prepare Texinfo for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/temp-tools/multilib/texinfo.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/multilib/texinfo.xml	2005-08-21 12:38:00 UTC (rev 6737)
+++ branches/cross-lfs/BOOK/temp-tools/multilib/texinfo.xml	2005-08-22 18:34:33 UTC (rev 6738)
@@ -43,21 +43,28 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
-    <para>Prepare Texinfo for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">




More information about the lfs-book mailing list