r6741 - in branches/cross-lfs/BOOK: boot/64 boot/common boot/mips64 boot/multilib chroot/64 chroot/common chroot/multilib final-system/common final-system/mips64 final-system/multilib temp-system/64 temp-system/common temp-system/multilib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Aug 22 13:37:22 PDT 2005


Author: manuel
Date: 2005-08-22 14:37:19 -0600 (Mon, 22 Aug 2005)
New Revision: 6741

Modified:
   branches/cross-lfs/BOOK/boot/64/util-linux.xml
   branches/cross-lfs/BOOK/boot/common/util-linux.xml
   branches/cross-lfs/BOOK/boot/mips64/util-linux.xml
   branches/cross-lfs/BOOK/boot/multilib/util-linux.xml
   branches/cross-lfs/BOOK/chroot/64/util-linux.xml
   branches/cross-lfs/BOOK/chroot/common/util-linux.xml
   branches/cross-lfs/BOOK/chroot/multilib/util-linux.xml
   branches/cross-lfs/BOOK/final-system/common/util-linux.xml
   branches/cross-lfs/BOOK/final-system/common/vim.xml
   branches/cross-lfs/BOOK/final-system/common/zlib.xml
   branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml
   branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml
   branches/cross-lfs/BOOK/final-system/multilib/vim.xml
   branches/cross-lfs/BOOK/final-system/multilib/zlib-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/zlib-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/zlib.xml
   branches/cross-lfs/BOOK/temp-system/64/zlib.xml
   branches/cross-lfs/BOOK/temp-system/common/zlib.xml
   branches/cross-lfs/BOOK/temp-system/multilib/zlib-64bit.xml
   branches/cross-lfs/BOOK/temp-system/multilib/zlib-n32.xml
   branches/cross-lfs/BOOK/temp-system/multilib/zlib.xml
Log:
Xinclude redo up to Zlib.

Modified: branches/cross-lfs/BOOK/boot/64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/64/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/boot/64/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -45,52 +45,62 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/para[1])"/>
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/screen[1])"/>
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
-    <para>Prepare Util-linux for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='bh'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/boot/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/boot/common/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -43,44 +43,48 @@
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-    <para>Util-linux does not use the freshly installed headers and
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <para os="ba">Util-linux does not use the freshly installed headers and
     libraries from the <filename class="directory">/tools</filename>
     directory by default. This is fixed by altering the configure script:</para>
 
-<screen><userinput>sed -i 's@/usr/include@/tools/include at g' configure</userinput></screen>
+<screen os="bb"><userinput>sed -i 's@/usr/include@/tools/include at g' configure</userinput></screen>
 
-    <para>Util-linux installs uses <option>-o root</option>, the following
+    <para os="bc">Util-linux installs uses <option>-o root</option>, the following
     <command>sed</command> removes that since we don't have users setup
     yet:</para>
 
-<screen><userinput>sed -i 's|-o root||' MCONFIG</userinput></screen>
+<screen os="bd"><userinput>sed -i 's|-o root||' MCONFIG</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/para[1])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
+<screen><userinput>./configure</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/screen[1])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Prepare Util-linux for compilation:</para>
+<screen os="be"><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU=""</userinput></screen>
 
-<screen><userinput>./configure</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU=""</userinput></screen>
-
-    <variablelist>
+    <variablelist os="bf">
       <title>The meaning of the make parameters:</title>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/util-linux.xml"
-      xpointer="xpointer(id('install-util-linux')/variablelist[1]/varlistentry[1])"/>
+      xpointer="xpointer(//*[@os='fa'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/util-linux.xml"
-      xpointer="xpointer(id('install-util-linux')/variablelist[1]/varlistentry[2])"/>
+      xpointer="xpointer(//*[@os='fb'])"/>
 
       <varlistentry>
         <term><parameter>HAVE_SHADOW=no</parameter></term>
@@ -112,13 +116,14 @@
 
     </variablelist>
 
-    <para>Install the package:</para>
+    <para os="bg">Install the package:</para>
 
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no USE_TTY_GROUP=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install</userinput></screen>
+<screen os="bh"><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no USE_TTY_GROUP=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install</userinput></screen>
 
-    <para>Now we will put a copy of mount in /tools/bin.</para>
+    <para os="bi">Now we will put a copy of mount in <filename
+    class="directory">/tools/bin</filename>:</para>
 
-<screen><userinput>cp ${LFS}/bin/mount /tools/bin</userinput></screen>
+<screen os="bj"><userinput>cp ${LFS}/bin/mount /tools/bin</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/mips64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/boot/mips64/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -45,56 +45,69 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips64/util-linux.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips64/util-linux.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/para[1])"/>
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/screen[1])"/>
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
-    <para>Util-linux has a compilation error when built using 64bit and
-    a MIPS processor. The follow patch addresses this error:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
+<screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
 
-    <para>Prepare Util-linux for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='bh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='bi'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='bj'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/multilib/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/boot/multilib/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -45,52 +45,62 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='bb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/para[1])"/>
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/screen[1])"/>
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bd'])"/>
 
-    <para>Prepare Util-linux for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[6])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[6])"/>
+    xpointer="xpointer(//*[@os='bh'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/chroot/64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/64/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/chroot/64/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -45,43 +45,41 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-    <para>Ensure that Util-linux uses the proper flags for our compile:</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='cd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='cf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='ch'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/chroot/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/common/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/chroot/common/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -43,30 +43,32 @@
   <sect2 role="installation">
     <title>Installation of Util-linux</title>
 
-    <para>Util-linux does not use the freshly installed headers and
-    libraries from the <filename class="directory">/tools</filename>
-    directory by default. This is fixed by altering the configure script:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../boot/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='ba'])"/>
 
-<screen><userinput>cp -p configure configure.orig
-sed 's@/usr/include@/tools/include at g' configure.orig > configure</userinput></screen>
+<screen os="ca"><userinput>cp -p configure configure.orig
+sed 's@/usr/include@/tools/include at g' configure.orig > configure</userinput></screen>
 
-    <para>Prepare Util-linux for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>./configure</userinput></screen>
 
-    <para>Compile some support routines:</para>
+    <para os="cb">Compile some support routines:</para>
 
-<screen><userinput>make ARCH="" CPU="" -C lib</userinput></screen>
+<screen os="cd"><userinput>make ARCH="" CPU="" -C lib</userinput></screen>
 
-    <para>Only a few of the utilities contained in this package need to be
+    <para os="ce">Only a few of the utilities contained in this package need to be
     built:</para>
 
-<screen><userinput>make ARCH="" CPU="" -C mount mount umount
+<screen os="cf"><userinput>make ARCH="" CPU="" -C mount mount umount
 make ARCH="" CPU="" -C text-utils more</userinput></screen>
 
-    <para>Copy these programs to the temporary tools directory:</para>
+    <para os="cg">Copy these programs to the temporary tools directory:</para>
 
-<screen><userinput>cp mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
+<screen os="ch"><userinput>cp mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/chroot/multilib/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/chroot/multilib/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/chroot/multilib/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -45,43 +45,41 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='ba'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ca'])"/>
 
-    <para>Ensure that Util-linux uses the proper flags for our compile:</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='cd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='cf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='ch'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/common/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -62,23 +62,23 @@
   <sect2 id="install-util-linux"  role="installation">
     <title>Installation of Util-linux</title>
 
-    <para>Util-linux fails to compile against newer versions of
+    <para os="a">Util-linux fails to compile against newer versions of
     Linux-Libc-Headers. The following patch properly fixes this issue:</para>
 
-<screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
-    <para>Prepare Util-linux for compilation:</para>
+    <para os="c">Prepare Util-linux for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
+<screen os="e"><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
 
-    <variablelist>
+    <variablelist os="f">
       <title>The meaning of the make parameters:</title>
 
-      <varlistentry>
+      <varlistentry os="fa">
         <term><parameter>HAVE_KILL=yes</parameter></term>
         <listitem>
           <para>This prevents the <command>kill</command> program (already
@@ -86,7 +86,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry os="fb">
         <term><parameter>HAVE_SLN=yes</parameter></term>
         <listitem>
           <para>This prevents the <command>sln</command> program (a
@@ -94,15 +94,16 @@
           by Glibc) from being built and installed again.</para>
         </listitem>
       </varlistentry>
+
     </variablelist>
 
-    <para>This package does not come with a test suite.</para>
+    <para os="g">This package does not come with a test suite.</para>
 
-    <para>Install the package and move the <command>logger</command> binary to
-    <filename class="directory">/bin</filename> as it is needed by the
+    <para os="h">Install the package and move the <command>logger</command> binary
+    to <filename class="directory">/bin</filename> as it is needed by the
     LFS-Bootscripts package:</para>
 
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
+<screen os="i"><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
 mv /usr/bin/logger /bin</userinput></screen>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/final-system/common/vim.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/vim.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/common/vim.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -54,24 +54,24 @@
   <sect2 id="install-vim" role="installation">
     <title>Installation of Vim</title>
 
-    <para>First, unpack both <filename>vim-&vim-version;.tar.bz2</filename>
+    <para os="a">First, unpack both <filename>vim-&vim-version;.tar.bz2</filename>
     and (optionally) <filename>vim-&vim-version;-lang.tar.gz</filename>
     archives into the same directory. Then, change the default location of
     the <filename>vimrc</filename> configuration file to <filename
     class="directory">/etc</filename>:</para>
 
-<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen>
+<screen os="b"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen>
 
-    <para>Vim has two known security vulnerabilities that have already been
+    <para os="c">Vim has two known security vulnerabilities that have already been
     addressed upstream. The following patch fixes the problems:</para>
 
-<screen><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen>
+<screen os="d"><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen>
 
-    <para>Prepare Vim for compilation:</para>
+    <para os="e">Prepare Vim for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-    <variablelist>
+    <variablelist os="f">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -88,27 +88,27 @@
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="g">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="h"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make test</userinput>.
+    <para os="i">To test the results, issue: <userinput>make test</userinput>.
     However, this test suite outputs a lot of binary data to the
     screen, which can cause issues with the settings of the current terminal.
     This can be resolved by redirecting the output to a log file.</para>
 
-    <para>Install the package:</para>
+    <para os="j">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
 
-    <para>Many users are used to using <command>vi</command> instead of
+    <para os="l">Many users are used to using <command>vi</command> instead of
     <command>vim</command>. To allow execution of <command>vim</command>
     when users habitually enter <command>vi</command>, create a
     symlink:</para>
 
-<screen><userinput>ln -s vim /usr/bin/vi</userinput></screen>
+<screen os="m"><userinput>ln -s vim /usr/bin/vi</userinput></screen>
 
-    <para>If an X Window System is going to be installed on the LFS
+    <para os="n">If an X Window System is going to be installed on the LFS
     system, it may be necessary to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
     additional libraries to be installed. For more information on this
@@ -116,8 +116,6 @@
     in the BLFS book at <ulink
     url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
 
-    <para/>
-
   </sect2>
 
   <sect2 id="conf-vim" role="configuration">

Modified: branches/cross-lfs/BOOK/final-system/common/zlib.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/zlib.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/common/zlib.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -45,7 +45,7 @@
   <sect2 id="install-zlib" role="installation">
     <title>Installation of Zlib</title>
 
-    <note>
+    <note os="a">
       <para>Zlib is known to build its shared library incorrectly if
       <envar>CFLAGS</envar> is specified in the environment. If using a
       specified <envar>CFLAGS</envar> variable, be sure to add the
@@ -54,45 +54,45 @@
       remove it afterwards.</para>
     </note>
 
-    <para>Prepare Zlib for compilation:</para>
+    <para os="b">Prepare Zlib for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</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 shared library:</para>
+    <para os="f">Install the shared library:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <para>The previous command installed a <filename
+    <para os="h">The previous command installed a <filename
     class="extension">.so</filename> file in <filename
     class="directory">/lib</filename>. We will remove it and relink it into
     <filename class="directory">/usr/lib</filename>:</para>
 
-<screen><userinput>rm /lib/libz.so
+<screen os="i"><userinput>rm /lib/libz.so
 ln -sf ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
 
-    <para>Build the static library:</para>
+    <para os="j">Build the static library:</para>
 
 <screen><userinput>make clean
 ./configure --prefix=/usr
 make</userinput></screen>
 
-    <para>To test the results again, issue:
+    <para os="k">To test the results again, issue:
     <userinput>make check</userinput>.</para>
 
-    <para>Install the static library:</para>
+    <para os="l">Install the static library:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="m"><userinput>make install</userinput></screen>
 
-    <para>Fix the permissions on the static library:</para>
+    <para os="n">Fix the permissions on the static library:</para>
 
-<screen><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
+<screen os="o"><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/mips64/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -48,35 +48,46 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Util-linux has a compilation error when built using 64bit
-     and a MIPS processor. The follow patch addresses this error:</para>
+    <para os="aa">Util-linux has a compilation error when built using 64bit
+    and a MIPS processor. The follow patch addresses this error:</para>
 
-<screen><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
+<screen os="ab"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
 
-    <para>Prepare Util-linux for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>This package does not come with a test suite.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes install</userinput></screen>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/multilib/util-linux.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -48,29 +48,41 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Util-linux for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(id('install-util-linux')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>This package does not come with a test suite.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/vim.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/vim.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/multilib/vim.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -19,7 +19,9 @@
   <sect2 id="package-vim" role="package">
     <title/>
 
-    <para>The Vim package contains a powerful text editor.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(id('package-vim')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -31,380 +33,86 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(id('package-vim')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils,
-        GCC, Glibc, Grep, Make, Ncurses, and Sed</seg>
-      </seglistitem>
-    </segmentedlist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(id('package-vim')/tip[1])"/>
 
-    <tip>
-      <title>Alternatives to Vim</title>
-
-      <para>If you prefer another editor—such as Emacs, Joe, or
-      Nano—please refer to <ulink
-      url="&blfs-root;view/svn/postlfs/editors.html"/>
-      for suggested installation instructions.</para>
-    </tip>
-
   </sect2>
 
   <sect2 id="install-vim" role="installation">
     <title>Installation of Vim</title>
 
-    <para>First, unpack both <filename>vim-&vim-version;.tar.bz2</filename>
-    and (optionally) <filename>vim-&vim-version;-lang.tar.gz</filename>
-    archives into the same directory. Then, change the default locations of
-    the <filename>vimrc</filename> and <filename>gvimrc</filename>
-    configuration files to <filename class="directory">/etc</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Vim for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
    --enable-multibyte</userinput></screen>
 
-    <para>The optional but highly recommended
-    <parameter>--enable-multibyte</parameter> switch includes support for
-    editing files in multibyte character encodings into
-    <command>vim</command>.  This is needed if using a locale with
-    a multibyte character set. This switch is also helpful to be able to
-    edit text files initially created in Linux distributions like Fedora
-    Core that use UTF-8 as a default character set.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>To test the results, issue: <userinput>make test</userinput>.
-    However, this test suite outputs a lot of chaotic characters to the
-    screen, which can cause issues with the settings of the current terminal.
-    Therefore, running the test suite here is optional.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-    <para>Many users are used to using <command>vi</command> instead of
-    <command>vim</command>. To allow execution of <command>vim</command>
-    when users habitually enter <command>vi</command>, create a
-    symlink:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>ln -s vim /usr/bin/vi</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
-    <para>If an X Window System is going to be installed on the LFS
-    system, it may be necessary to recompile Vim after installing X. Vim
-    comes with a GUI version of the editor that requires X and some
-    additional libraries to be installed. For more information on this
-    process, refer to the Vim documentation and the Vim installation page
-    in the BLFS book at <ulink
-    url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
-
-    <para/>
-
   </sect2>
 
-  <sect2 id="conf-vim" role="configuration">
-    <title>Configuring Vim</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/vim.xml"
+  xpointer="xpointer(id('conf-vim'))"/>
 
-    <indexterm zone="conf-vim">
-      <primary sortas="e-/etc/vim">/etc/vim</primary>
-    </indexterm>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/vim.xml"
+  xpointer="xpointer(id('contents-vim'))"/>
 
-    <para>By default, <command>vim</command> runs in vi-incompatible mode.
-    This may be new to users who have used other editors in the past. The
-    <quote>nocompatible</quote> setting is included below to highlight the
-    fact that a new behavior is being used. It also reminds those who
-    would change to <quote>compatible</quote> mode that it should appear
-    first.  This is necessary because it changes other settings, and
-    overrides must come after this setting. Create a default
-    <command>vim</command> configuration file by running the following:</para>
-
-<screen><userinput>cat > /etc/vimrc << "EOF"
-<literal>" Begin /etc/vimrc
-
-set nocompatible
-set backspace=2
-syntax on
-if (&term == "iterm") || (&term == "putty")
-  set background=dark
-endif
-
-" End /etc/vimrc</literal>
-EOF</userinput></screen>
-
-
-    <para>The <parameter>set nocompatible</parameter> makes
-    <command>vim</command> behave in a more useful way (the default) than
-    the vi-compatible manner. Remove the <quote>no</quote> to keep the
-    old <command>vi</command> behavior. The <parameter>set
-    backspace=2</parameter> allows backspacing over line breaks,
-    autoindents, and the start of insert. The <parameter>syntax
-    on</parameter> enables vim's syntax highlighting. Finally, the
-    <emphasis>if</emphasis> statement with the <parameter>set
-    background=dark</parameter> corrects <command>vim</command>'s guess
-    about the background color of some terminal emulators. This gives the
-    highlighting a better color scheme for use on the black background of
-    these programs.</para>
-
-    <para>Documentation for other available options can be obtained by
-    running the following command:</para>
-
-<screen><userinput>vim -c ':options'</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-vim" role="content">
-    <title>Contents of Vim</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
-        pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
-        tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
-        vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="efm_filter.pl">
-        <term><command>efm_filter.pl</command></term>
-        <listitem>
-          <para>A filter for creating an error file that can be read
-          by <command>vim</command></para>
-          <indexterm zone="ch-system-vim efm_filter.pl">
-            <primary sortas="b-efm_filter.pl">efm_filter.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="efm_perl.pl">
-        <term><command>efm_perl.pl</command></term>
-        <listitem>
-          <para>Reformats the error messages of the Perl interpreter for use
-          with the <quote>quickfix</quote> mode of <command>vim</command></para>
-          <indexterm zone="ch-system-vim efm_perl.pl">
-            <primary sortas="b-efm_perl.pl">efm_perl.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ex">
-        <term><command>ex</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> in ex mode</para>
-          <indexterm zone="ch-system-vim ex">
-            <primary sortas="b-ex">ex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="less.sh">
-        <term><command>less.sh</command></term>
-        <listitem>
-          <para>A script that starts <command>vim</command> with less.vim</para>
-          <indexterm zone="ch-system-vim less.sh">
-            <primary sortas="b-less.sh">less.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mve.awk">
-        <term><command>mve.awk</command></term>
-        <listitem>
-          <para>Processes <command>vim</command> errors</para>
-          <indexterm zone="ch-system-vim mve.awk">
-            <primary sortas="b-mve.awk">mve.awk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltags.pl">
-        <term><command>pltags.pl</command></term>
-        <listitem>
-          <para>Creates a tags file for Perl code for use by
-          <command>vim</command></para>
-          <indexterm zone="ch-system-vim pltags.pl">
-            <primary sortas="b-pltags.pl">pltags.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ref">
-        <term><command>ref</command></term>
-        <listitem>
-          <para>Checks the spelling of arguments</para>
-          <indexterm zone="ch-system-vim ref">
-            <primary sortas="b-ref">ref</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rview">
-        <term><command>rview</command></term>
-        <listitem>
-          <para>Is a restricted version of <command>view</command>; no shell
-          commands can be started and <command>view</command> cannot be
-          suspended</para>
-          <indexterm zone="ch-system-vim rview">
-            <primary sortas="b-rview">rview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rvim">
-        <term><command>rvim</command></term>
-        <listitem>
-          <para>Is a restricted version of <command>vim</command>; no shell
-          commands can be started and <command>vim</command> cannot be
-          suspended</para>
-          <indexterm zone="ch-system-vim rvim">
-            <primary sortas="b-rvim">rvim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shtags.pl">
-        <term><command>shtags.pl</command></term>
-        <listitem>
-          <para>Generates a tag file for Perl scripts</para>
-          <indexterm zone="ch-system-vim shtags.pl">
-            <primary sortas="b-shtags.pl">shtags.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcltags">
-        <term><command>tcltags</command></term>
-        <listitem>
-          <para>Generates a tag file for TCL code</para>
-          <indexterm zone="ch-system-vim tcltags">
-            <primary sortas="b-tcltags">tcltags</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="view">
-        <term><command>view</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> in read-only mode</para>
-          <indexterm zone="ch-system-vim view">
-            <primary sortas="b-view">view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vi">
-        <term><command>vi</command></term>
-        <listitem>
-          <para>Link to <command>vim</command></para>
-          <indexterm zone="ch-system-vim vi">
-            <primary sortas="b-vi">vi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim">
-        <term><command>vim</command></term>
-        <listitem>
-          <para>Is the editor</para>
-          <indexterm zone="ch-system-vim vim">
-            <primary sortas="b-vim">vim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim132">
-        <term><command>vim132</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> with the terminal in 132-column
-          mode</para>
-          <indexterm zone="ch-system-vim vim132">
-            <primary sortas="b-vim132">vim132</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim2html.pl">
-        <term><command>vim2html.pl</command></term>
-        <listitem>
-          <para>Converts Vim documentation to HypterText Markup Language
-          (HTML)</para>
-          <indexterm zone="ch-system-vim vim2html.pl">
-            <primary sortas="b-vim2html.pl">vim2html.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimdiff">
-        <term><command>vimdiff</command></term>
-        <listitem>
-          <para>Edits two or three versions of a file with <command>vim</command>
-          and show differences</para>
-          <indexterm zone="ch-system-vim vimdiff">
-            <primary sortas="b-vimdiff">vimdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimm">
-        <term><command>vimm</command></term>
-        <listitem>
-          <para>Enables the DEC locator input model on a remote terminal</para>
-          <indexterm zone="ch-system-vim vimm">
-            <primary sortas="b-vimm">vimm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimspell.sh">
-        <term><command>vimspell.sh</command></term>
-        <listitem>
-          <para>Spells a file and generates the syntax statements necessary
-          to highlight in <command>vim</command>. This script requires the
-          old Unix <command>spell</command> command, which is provided neither
-          in LFS nor in BLFS</para>
-          <indexterm zone="ch-system-vim vimspell.sh">
-            <primary sortas="b-vimspell.sh">vimspell.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimtutor">
-        <term><command>vimtutor</command></term>
-        <listitem>
-          <para>Teaches the basic keys and commands of
-          <command>vim</command></para>
-          <indexterm zone="ch-system-vim vimtutor">
-            <primary sortas="b-vimtutor">vimtutor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xxd">
-        <term><command>xxd</command></term>
-        <listitem>
-          <para>Creates a hex dump of the given file; it can
-          also do the reverse, so it can be used for binary patching</para>
-          <indexterm zone="ch-system-vim xxd">
-            <primary sortas="b-xxd">xxd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/multilib/zlib-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/zlib-64bit.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/multilib/zlib-64bit.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -44,62 +44,70 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(id('install-zlib')/note[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare Zlib for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
-   --shared --libdir=/usr/lib64</userinput></screen>
+   --shared --libdir=/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.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/zlib.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Build the static library:</para>
+    <para>The previous command installed a <filename
+    class="extension">.so</filename> file in <filename
+    class="directory">/lib64</filename>. We will remove it and relink it into
+    <filename class="directory">/usr/lib64</filename>:</para>
 
+<screen><userinput>rm /lib64/libz.so
+ln -sf ../../lib64/libz.so.&zlib-version; /usr/lib64/libz.so</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
 <screen><userinput>make clean
-CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64
+CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
+    --prefix=/usr --libdir=/usr/lib64
 make</userinput></screen>
 
-    <para>To test the results again, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <para>Install the static library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <para>Fix the permissions on the static library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
 <screen><userinput>chmod 644 /usr/lib64/libz.a</userinput></screen>
 
-    <para>It is good policy and common practice to place important
-    libraries into the <filename class="directory">/lib64</filename>
-    directory. This is most important in scenarios where <filename
-    class="directory">/usr</filename> is on a separate partition.
-    Essentially, the run-time components of any libraries that are used by
-    programs in <filename class="directory">/bin</filename> or <filename
-    class="directory">/sbin</filename> should reside in <filename
-    class="directory">/lib64</filename> so that they are on the root
-    partition and available in the event of <filename
-    class="directory">/usr</filename> being inaccessible.</para>
-
-    <para>For the above reason, move the run-time components of the shared Zlib
-    into <filename class="directory">/lib64</filename>:</para>
-
-<screen><userinput>mv /usr/lib64/libz.so.* /lib64</userinput></screen>
-
-    <para>Fix the <filename class="symlink">/usr/lib64/libz.so</filename>
-    symlink:</para>
-
-<screen><userinput>ln -sf ../../lib64/libz.so.1 /usr/lib64/libz.so</userinput></screen>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/multilib/zlib-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/zlib-n32.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/multilib/zlib-n32.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -44,62 +44,70 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(id('install-zlib')/note[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare Zlib for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
-   --shared --libdir=/usr/lib32</userinput></screen>
+   --shared --libdir=/lib32</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.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/zlib.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Build the static library:</para>
+    <para>The previous command installed a <filename
+    class="extension">.so</filename> file in <filename
+    class="directory">/lib32</filename>. We will remove it and relink it into
+    <filename class="directory">/usr/lib32</filename>:</para>
 
+<screen><userinput>rm /lib32/libz.so
+ln -sf ../../lib32/libz.so.&zlib-version; /usr/lib32/libz.so</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
 <screen><userinput>make clean
-CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32
+CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure \
+    --prefix=/usr --libdir=/usr/lib32
 make</userinput></screen>
 
-    <para>To test the results again, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <para>Install the static library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <para>Fix the permissions on the static library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
 <screen><userinput>chmod 644 /usr/lib32/libz.a</userinput></screen>
 
-    <para>It is good policy and common practice to place important
-    libraries into the <filename class="directory">/lib32</filename>
-    directory. This is most important in scenarios where <filename
-    class="directory">/usr</filename> is on a separate partition.
-    Essentially, the run-time components of any libraries that are used by
-    programs in <filename class="directory">/bin</filename> or <filename
-    class="directory">/sbin</filename> should reside in <filename
-    class="directory">/lib32</filename> so that they are on the root
-    partition and available in the event of <filename
-    class="directory">/usr</filename> being inaccessible.</para>
-
-    <para>For the above reason, move the run-time components of the shared Zlib
-    into <filename class="directory">/lib32</filename>:</para>
-
-<screen><userinput>mv /usr/lib32/libz.so.* /lib32</userinput></screen>
-
-    <para>Fix the <filename class="symlink">/usr/lib32/libz.so</filename>
-    symlink:</para>
-
-<screen><userinput>ln -sf ../../lib32/libz.so.1 /usr/lib32/libz.so</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/final-system/multilib/zlib.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/zlib.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/final-system/multilib/zlib.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -44,62 +44,71 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(id('install-zlib')/note[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare Zlib for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr \
-   --shared</userinput></screen>
+   --shared --libdir=/lib</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.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/zlib.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Build the static library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
 <screen><userinput>make clean
 CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr
 make</userinput></screen>
 
-    <para>To test the results again, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <para>Install the static library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <para>Fix the permissions on the static library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
-<screen><userinput>chmod 644 /usr/lib/libz.a</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
-    <para>It is good policy and common practice to place important
-    libraries into the <filename class="directory">/lib</filename>
-    directory. This is most important in scenarios where <filename
-    class="directory">/usr</filename> is on a separate partition.
-    Essentially, the run-time components of any libraries that are used by
-    programs in <filename class="directory">/bin</filename> or <filename
-    class="directory">/sbin</filename> should reside in <filename
-    class="directory">/lib</filename> so that they are on the root
-    partition and available in the event of <filename
-    class="directory">/usr</filename> being inaccessible.</para>
-
-    <para>For the above reason, move the run-time components of the shared Zlib
-    into <filename class="directory">/lib</filename>:</para>
-
-<screen><userinput>mv /usr/lib/libz.so.* /lib</userinput></screen>
-
-    <para>Fix the <filename class="symlink">/usr/lib/libz.so</filename>
-    symlink:</para>
-
-<screen><userinput>ln -sf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/temp-system/64/zlib.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/zlib.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/temp-system/64/zlib.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -43,22 +43,36 @@
   <sect2 role="installation">
     <title>Installation of Zlib</title>
 
-    <para>Prepare Zlib for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
 <screen><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/zlib.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/zlib.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/temp-system/common/zlib.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -43,11 +43,17 @@
   <sect2 role="installation">
     <title>Installation of Zlib</title>
 
-    <para>Prepare Zlib for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/zlib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/zlib.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
 <screen><userinput>./configure --prefix=/tools --shared</userinput></screen>
 
-    <variablelist>
+    <variablelist os="aa">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -59,13 +65,21 @@
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/zlib.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/zlib.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/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/zlib-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/zlib-64bit.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/temp-system/multilib/zlib-64bit.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -43,18 +43,32 @@
   <sect2 role="installation">
     <title>Installation of Zlib</title>
 
-    <para>Prepare Zlib for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
 <screen><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --shared --libdir=/tools/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/zlib-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/zlib-n32.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/temp-system/multilib/zlib-n32.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -43,18 +43,32 @@
   <sect2 role="installation">
     <title>Installation of Zlib</title>
 
-    <para>Prepare Zlib for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
 <screen><userinput>CC="${CC} ${BUILDN32}" \
    ./configure --prefix=/tools --shared --libdir=/tools/lib32</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/zlib.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/zlib.xml	2005-08-22 19:16:28 UTC (rev 6740)
+++ branches/cross-lfs/BOOK/temp-system/multilib/zlib.xml	2005-08-22 20:37:19 UTC (rev 6741)
@@ -43,22 +43,36 @@
   <sect2 role="installation">
     <title>Installation of Zlib</title>
 
-    <para>Prepare Zlib for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
 <screen><userinput>CC="${CC} ${BUILD32}" \
    ./configure --prefix=/tools --shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the shared library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
 




More information about the lfs-book mailing list