r6737 - in branches/cross-lfs/BOOK: boot/64 boot/common boot/mips boot/mips64 boot/multilib boot/sparc boot/sparc64 final-system/common final-system/mips final-system/mips64 final-system/multilib final-system/sparc final-system/sparc64

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Aug 21 05:38:02 PDT 2005


Author: manuel
Date: 2005-08-21 06:38:00 -0600 (Sun, 21 Aug 2005)
New Revision: 6737

Modified:
   branches/cross-lfs/BOOK/boot/64/sysvinit.xml
   branches/cross-lfs/BOOK/boot/common/sysvinit.xml
   branches/cross-lfs/BOOK/boot/mips/sysvinit.xml
   branches/cross-lfs/BOOK/boot/mips64/sysvinit.xml
   branches/cross-lfs/BOOK/boot/multilib/sysvinit.xml
   branches/cross-lfs/BOOK/boot/sparc/sysvinit.xml
   branches/cross-lfs/BOOK/boot/sparc64/sysvinit.xml
   branches/cross-lfs/BOOK/final-system/common/procps.xml
   branches/cross-lfs/BOOK/final-system/common/psmisc.xml
   branches/cross-lfs/BOOK/final-system/common/readline.xml
   branches/cross-lfs/BOOK/final-system/common/sed.xml
   branches/cross-lfs/BOOK/final-system/common/sysklogd.xml
   branches/cross-lfs/BOOK/final-system/common/sysvinit.xml
   branches/cross-lfs/BOOK/final-system/mips/procps.xml
   branches/cross-lfs/BOOK/final-system/mips/sysvinit.xml
   branches/cross-lfs/BOOK/final-system/mips64/procps-64bit.xml
   branches/cross-lfs/BOOK/final-system/mips64/procps-n32.xml
   branches/cross-lfs/BOOK/final-system/mips64/procps.xml
   branches/cross-lfs/BOOK/final-system/mips64/sysvinit.xml
   branches/cross-lfs/BOOK/final-system/multilib/psmisc.xml
   branches/cross-lfs/BOOK/final-system/multilib/readline-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/readline-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/readline.xml
   branches/cross-lfs/BOOK/final-system/multilib/sed.xml
   branches/cross-lfs/BOOK/final-system/multilib/sysklogd.xml
   branches/cross-lfs/BOOK/final-system/multilib/sysvinit.xml
   branches/cross-lfs/BOOK/final-system/sparc/sysvinit.xml
   branches/cross-lfs/BOOK/final-system/sparc64/sysvinit.xml
Log:
Xinclude redo up to Syxvinit.

Modified: branches/cross-lfs/BOOK/boot/64/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/64/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/boot/64/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -45,24 +45,27 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make -C src clobber
-make -C src CC="${CC} ${BUILD64}" LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/common/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/boot/common/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -43,23 +43,27 @@
   <sect2 role="installation">
     <title>Installation of Sysvinit</title>
 
-    <para>Now we do some modifications so we can boot into this
+    <para os="aa">Now we do some modifications so we can boot into this
     during our build:</para>
 
-<screen><userinput>cp src/Makefile src/Makefile.orig
+<screen os="ab"><userinput>cp src/Makefile src/Makefile.orig
 sed -e 's at root@0 at g' \
     -e "s@/dev/initctl@${LFS}&@g" \
     -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3 at g' \
     src/Makefile.orig > src/Makefile</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make -C src clobber
+<screen os="ac"><userinput>make -C src clobber
 make -C src CC="${CC}" LDFLAGS="-s"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>install -d ${LFS}/bin
+<screen os="ad"><userinput>install -d ${LFS}/bin
 install -d ${LFS}/usr/bin
 install -d ${LFS}/usr/include
 install -d ${LFS}/usr/share/man/man{1,5,8}

Modified: branches/cross-lfs/BOOK/boot/mips/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/boot/mips/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -40,10 +40,35 @@
 
   </sect2>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='installation'])"/>
+  <sect2 role="installation">
+    <title>Installation of Sysvinit</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+  </sect2>
+
   <sect2 id="conf-tools-sysvinit" role="configuration">
     <title>Configuring Sysvinit</title>
 

Modified: branches/cross-lfs/BOOK/boot/mips64/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/boot/mips64/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -45,24 +45,27 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make -C src clobber
-make -C src CC="${CC} ${BUILD64}" LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/multilib/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/boot/multilib/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -45,24 +45,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make -C src clobber
+<screen os="ac"><userinput>make -C src clobber
 make -C src CC="${CC} ${BUILD64}" LDFLAGS="-s"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/sparc/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/boot/sparc/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -40,10 +40,35 @@
 
   </sect2>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='installation'])"/>
+  <sect2 role="installation">
+    <title>Installation of Sysvinit</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+  </sect2>
+
   <sect2 id="conf-tools-sysvinit" role="configuration">
     <title>Configuring Sysvinit</title>
 

Modified: branches/cross-lfs/BOOK/boot/sparc64/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/boot/sparc64/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -45,24 +45,27 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make -C src clobber
-make -C src CC="${CC} ${BUILD64}" LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/sysvinit.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/procps.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/procps.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/common/procps.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -53,8 +53,6 @@
 
 <screen><userinput>make install</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 id="contents-procps" role="content">

Modified: branches/cross-lfs/BOOK/final-system/common/psmisc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/psmisc.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/common/psmisc.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -46,11 +46,11 @@
   <sect2 id="install-psmisc" role="installation">
     <title>Installation of Psmisc</title>
 
-    <para>Prepare Psmisc for compilation:</para>
+    <para os="a">Prepare Psmisc for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen>
 
-    <variablelist>
+    <variablelist os="b">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -65,28 +65,28 @@
       </varlistentry>
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
-    <para>There is no reason for the <command>pstree</command> and
+    <para os="g">There is no reason for the <command>pstree</command> and
     <command>pstree.x11</command> programs to reside in <filename
     class="directory">/bin</filename>. Therefore, move them to <filename
     class="directory">/usr/bin</filename>:</para>
 
-<screen><userinput>mv /bin/pstree* /usr/bin</userinput></screen>
+<screen os="h"><userinput>mv /bin/pstree* /usr/bin</userinput></screen>
 
-    <para>By default, Psmisc's <command>pidof</command> program is not installed.
+    <para os="i">By default, Psmisc's <command>pidof</command> program is not installed.
     This usually is not a problem because it is installed later in the Sysvinit
     package, which provides a better <command>pidof</command> program. If
     Sysvinit will not be used for a particular system, complete the installation
     of Psmisc by creating the following symlink:</para>
 
-<screen><userinput>ln -s killall /bin/pidof</userinput></screen>
+<screen os="j"><userinput>ln -s killall /bin/pidof</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/readline.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/readline.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/common/readline.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -46,22 +46,22 @@
   <sect2 id="install-readline" role="installation">
     <title>Installation of Readline</title>
 
-    <para>The following patch includes a fix for a problem where Readline
+    <para os="a">The following patch includes a fix for a problem where Readline
     sometimes only shows 33 characters on a line and then wraps to the
     next line. It also includes other fixes recommended by the Readline
     author.</para>
 
-<screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
 
-    <para>Prepare Readline for compilation:</para>
+    <para os="c">Prepare Readline for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="d">Compile the package:</para>
 
-<screen><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+<screen os="e"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
 
-    <variablelist>
+    <variablelist os="f">
       <title>The meaning of the make option:</title>
 
       <varlistentry>
@@ -73,24 +73,24 @@
       </varlistentry>
     </variablelist>
 
-    <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>
 
-    <para>Give Readline's dynamic libraries to a more appropriate
+    <para os="i">Give Readline's dynamic libraries to a more appropriate
     permissions:</para>
 
-<screen><userinput>chmod 755 /lib/lib{readline,history}.so*</userinput></screen>
+<screen os="j"><userinput>chmod 755 /lib/lib{readline,history}.so*</userinput></screen>
 
-    <para>Now move the static libraries to a more appropriate location:</para>
+    <para os="k">Now move the static libraries to a more appropriate location:</para>
 
-<screen><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
+<screen os="l"><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
 
-    <para>Next, remove the <filename class="extension">.so</filename>
+    <para os="m">Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib</filename> and relink them into
     <filename class="directory">/usr/lib</filename>.</para>
 
-<screen><userinput>rm /lib/lib{readline,history}.so
+<screen os="n"><userinput>rm /lib/lib{readline,history}.so
 ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
 ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/final-system/common/sed.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/sed.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/common/sed.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -52,20 +52,20 @@
 
 <screen os="b"><userinput>sed -i 's@/doc@&/sed-&sed-version;@' doc/Makefile.in</userinput></screen>
 
-    <para>Prepare Sed for compilation:</para>
+    <para os="c">Prepare Sed for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin</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/sysklogd.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/sysklogd.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/common/sysklogd.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -45,18 +45,18 @@
   <sect2 id="install-sysklogd" role="installation">
     <title>Installation of Sysklogd</title>
 
-    <para>The following patch fixes various issues, including a problem building
-    Sysklogd with Linux 2.6 series kernels</para>
+    <para os="a">The following patch fixes various issues, including a
+    problem building Sysklogd with Linux 2.6 series kernels</para>
 
-<screen><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="d">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="e"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/common/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -42,7 +42,7 @@
   <sect2 id="install-sysvinit" role="installation">
     <title>Installation of Sysvinit</title>
 
-    <para>When run-levels are changed (for example, when halting the
+    <para os="a">When run-levels are changed (for example, when halting the
     system), <command>init</command> sends termination signals to those
     processes that <command>init</command> itself started and that should
     not be running in the new run-level.  While doing this,
@@ -53,17 +53,17 @@
     <quote>Sending processes started by init the TERM signal</quote>
     instead:</para>
 
-<screen><userinput>sed -i 's at Sending processes@& started by init at g' \
+<screen os="b"><userinput>sed -i 's at Sending processes@& started by init at g' \
     src/init.c</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make -C src clobber
+<screen os="d"><userinput>make -C src clobber
 make -C src</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make -C src install</userinput></screen>
+<screen os="f"><userinput>make -C src install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/mips/procps.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/procps.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/mips/procps.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -23,16 +23,20 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
 
-    <para>The patch below fixes an issue with Procps. Without this
+    <para os="a">The patch below fixes an issue with Procps. Without this
     patch when the command <command>ps aux</command> is run you will
     receive a signal 11.</para>
 
-<screen><userinput>patch -Np1 -i ../&procps-mips-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&procps-mips-patch;</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(id('install-procps')/para[1]/range-to(id('install-procps')/para[last()]))"/>
+    <para>Compile the package:</para>
 
+<screen><userinput>make</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
 </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/mips/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/mips/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -16,14 +16,58 @@
     <primary sortas="a-Sysvinit">Sysvinit</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('package-sysvinit'))"/>
+  <sect2 role="package">
+    <title/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('install-sysvinit'))"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(id('package-sysvinit')/para[1])"/>
 
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(id('package-sysvinit')/segmentedlist[2])"/>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Sysvinit</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
   <sect2 id="conf-sysvinit" role="configuration">
     <title>Configuring Sysvinit</title>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64/procps-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/procps-64bit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/mips64/procps-64bit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -42,11 +42,13 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
 
-    <para>The patch below fixes an issue with Procps. Without this
-    patch when the command <command>ps aux</command> is run you will
-    receive a signal 11.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="procps.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&procps-mips-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="procps.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64/procps-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/procps-n32.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/mips64/procps-n32.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -42,11 +42,13 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
 
-    <para>The patch below fixes an issue with Procps. Without this
-    patch when the command <command>ps aux</command> is run you will
-    receive a signal 11.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="procps.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&procps-mips-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="procps.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64/procps.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/procps.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/mips64/procps.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -42,11 +42,13 @@
   <sect2 role="installation">
     <title>Installation of Procps</title>
 
-    <para>The patch below fixes an issue with Procps. Without this
-    patch when the command <command>ps aux</command> is run you will
-    receive a signal 11.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/procps.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&procps-mips-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/procps.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/mips64/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/mips64/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -16,37 +16,56 @@
     <primary sortas="a-Sysvinit">Sysvinit</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('package-sysvinit'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(id('package-sysvinit')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(id('package-sysvinit')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
 
     <title>Installation of Sysvinit</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../multilib/sysvinit.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/psmisc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/psmisc.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/multilib/psmisc.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -42,38 +42,48 @@
   <sect2 role="installation">
     <title>Installation of Psmisc</title>
 
-    <para>Prepare Psmisc for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/psmisc.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --exec-prefix=""</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/psmisc.xml"
-    xpointer="xpointer(id('install-psmisc')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/psmisc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/psmisc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/psmisc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/psmisc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/psmisc.xml"
-    xpointer="xpointer(id('install-psmisc')/para[4])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/psmisc.xml"
-    xpointer="xpointer(id('install-psmisc')/screen[4])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/psmisc.xml"
-    xpointer="xpointer(id('install-psmisc')/para[5])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/psmisc.xml"
-    xpointer="xpointer(id('install-psmisc')/screen[5])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/readline-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/readline-64bit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/multilib/readline-64bit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -44,39 +44,48 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Readline for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>Give Readline's dynamic libraries to a more appropriate
-    permissions:</para>
-
 <screen><userinput>chmod 755 /lib64/lib{readline,history}.so*</userinput></screen>
 
-    <para>Now we move the static libraries to a more appropriate location:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><userinput>mv /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
 
-    <para>Now we will remove the old, <filename class="extension">.so</filename>
+    <para>Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib64</filename> and relink them into
     <filename class="directory">/usr/lib64</filename>.</para>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/readline-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/readline-n32.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/multilib/readline-n32.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -44,39 +44,48 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Readline for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>Give Readline's dynamic libraries to a more appropriate
-    permissions:</para>
-
 <screen><userinput>chmod 755 /lib32/lib{readline,history}.so*</userinput></screen>
 
-    <para>Now we move the static libraries to a more appropriate location:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><userinput>mv /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
 
-    <para>Now we will remove the old, <filename class="extension">.so</filename>
+    <para>Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib32</filename> and relink them into
     <filename class="directory">/usr/lib32</filename>.</para>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/readline.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/readline.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/multilib/readline.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -44,45 +44,62 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Readline for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    ./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/readline.xml"
-    xpointer="xpointer(id('install-readline')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Give Readline's dynamic libraries to a more appropriate
-    permissions:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>chmod 755 /lib/lib{readline,history}.so*</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>Now we move the static libraries to a more appropriate location:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>mv /lib/lib{readline,history}.a /usr/lib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-    <para>Now we will remove the old, <filename class="extension">.so</filename>
-    files in <filename class="directory">/lib</filename> and relink them into
-    <filename class="directory">/usr/lib</filename>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-<screen><userinput>rm /lib/lib{readline,history}.so
-ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
-ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/readline.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/sed.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/sed.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/multilib/sed.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -50,21 +50,32 @@
     href="../common/sed.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Sed for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --bindir=/bin</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.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/sed.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/sysklogd.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/sysklogd.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/multilib/sysklogd.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -44,19 +44,25 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysklogd.xml"
-    xpointer="xpointer(id('install-sysklogd')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysklogd.xml"
-    xpointer="xpointer(id('install-sysklogd')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysklogd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysklogd.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysklogd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/multilib/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -41,20 +41,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(id('install-sysvinit')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/sysvinit.xml"
-    xpointer="xpointer(id('install-sysvinit')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make -C src clobber
+<screen os="d"><userinput>make -C src clobber
 make -C src CC="gcc ${BUILD64}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make -C src install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/sparc/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -16,14 +16,58 @@
     <primary sortas="a-Sysvinit">Sysvinit</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('package-sysvinit'))"/>
+  <sect2 role="package">
+    <title/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('install-sysvinit'))"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(id('package-sysvinit')/para[1])"/>
 
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(id('package-sysvinit')/segmentedlist[2])"/>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Sysvinit</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+  </sect2>
+
   <sect2 id="conf-sysvinit" role="configuration">
     <title>Configuring Sysvinit</title>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc64/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/sysvinit.xml	2005-08-21 12:30:53 UTC (rev 6736)
+++ branches/cross-lfs/BOOK/final-system/sparc64/sysvinit.xml	2005-08-21 12:38:00 UTC (rev 6737)
@@ -16,37 +16,56 @@
     <primary sortas="a-Sysvinit">Sysvinit</primary>
   </indexterm>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('package-sysvinit'))"/>
+  <sect2 role="package">
+    <title/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(id('package-sysvinit')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(id('package-sysvinit')/segmentedlist[2])"/>
+
+  </sect2>
+
   <sect2 role="installation">
 
     <title>Installation of Sysvinit</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/screen[2])"/>
+    href="../multilib/sysvinit.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/para[3])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/sysvinit.xml"
-      xpointer="xpointer(//*[@role='installation']/screen[3])"/>
+    href="../common/sysvinit.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 




More information about the lfs-book mailing list