r6732 - in branches/cross-lfs/BOOK/final-system: common multilib sparc sparc64

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Aug 20 11:38:37 PDT 2005


Author: manuel
Date: 2005-08-20 12:38:35 -0600 (Sat, 20 Aug 2005)
New Revision: 6732

Modified:
   branches/cross-lfs/BOOK/final-system/common/introduction.xml
   branches/cross-lfs/BOOK/final-system/common/iproute2.xml
   branches/cross-lfs/BOOK/final-system/common/less.xml
   branches/cross-lfs/BOOK/final-system/common/libtool.xml
   branches/cross-lfs/BOOK/final-system/common/man.xml
   branches/cross-lfs/BOOK/final-system/common/mktemp.xml
   branches/cross-lfs/BOOK/final-system/multilib/introduction.xml
   branches/cross-lfs/BOOK/final-system/multilib/iproute2.xml
   branches/cross-lfs/BOOK/final-system/multilib/less.xml
   branches/cross-lfs/BOOK/final-system/multilib/libtool-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/libtool-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/libtool.xml
   branches/cross-lfs/BOOK/final-system/multilib/man.xml
   branches/cross-lfs/BOOK/final-system/multilib/mktemp.xml
   branches/cross-lfs/BOOK/final-system/sparc/kbd.xml
   branches/cross-lfs/BOOK/final-system/sparc64/kbd.xml
Log:
Xinclude redo up to mktemp.

Modified: branches/cross-lfs/BOOK/final-system/common/introduction.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/introduction.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/common/introduction.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -10,7 +10,7 @@
 
   <title>Introduction</title>
 
-  <para>In this chapter, we enter the building site and start
+  <para os="a">In this chapter, we enter the building site and start
   constructing the LFS system in earnest. The installation of this
   software is straightforward. Although in many cases the installation
   instructions could be made shorter and more generic, we have opted
@@ -21,7 +21,7 @@
   its contents is given, followed by concise descriptions of each
   program and library the package installed.</para>
 
-  <para>If using the compiler optimizations provided in this chapter,
+  <para os="b">If using the compiler optimizations provided in this chapter,
   please review the optimization hint at <ulink
   url="&hints-root;optimization.txt"/>.  Compiler optimizations can make
   a program run slightly faster, but they may also cause compilation
@@ -36,7 +36,7 @@
   The subsequent system will still run very fast and be stable at the
   same time.</para>
 
-  <para>The order that packages are installed in this chapter needs to
+  <para os="c">The order that packages are installed in this chapter needs to
   be strictly followed to ensure that no program accidentally acquires a
   path referring to <filename class="directory">/tools</filename>
   hard-wired into it. For the same reason, do not compile packages in
@@ -46,7 +46,7 @@
   cause the program to stop working when that directory is
   removed.</para>
 
-  <para>Before the installation instructions, each installation page
+  <para os="d">Before the installation instructions, each installation page
   provides information about the package, including a concise
   description of what it contains, approximately how long it will take
   to build, how much disk space is required during this building
@@ -55,14 +55,14 @@
   programs and libraries (along with brief descriptions of these) that
   the package installs.</para>
 
-  <para>To keep track of which package installs particular files, a package
+  <para os="e">To keep track of which package installs particular files, a package
   manager can be used. For a general overview of different styles of package
   managers, please refer to <ulink
   url="&blfs-root;view/svn/introduction/important.html"/>.
   For a package management method specifically geared towards LFS, we
   recommend <ulink url="&hints-root;more_control_and_pkg_man.txt"/>.</para>
 
-  <note>
+  <note os="f">
     <para>The remainder of this book is to be performed while logged
     in as user <systemitem class="username">root</systemitem> and no longer
     as user <systemitem class="username">lfs</systemitem>.</para>

Modified: branches/cross-lfs/BOOK/final-system/common/iproute2.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/iproute2.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/common/iproute2.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -45,7 +45,7 @@
   <sect2 id="install-iproute2" role="installation">
     <title>Installation of IPRoute2</title>
 
-    <para>The <command>arpd</command> binary included in this package is
+    <para os="a">The <command>arpd</command> binary included in this package is
     dependent on Berkeley DB.  Because <command>arpd</command> is not a
     very common requirement on a base Linux system, remove the dependency
     on Berkeley DB by applying the <command>sed</command> command below.
@@ -53,17 +53,17 @@
     compiling Berkeley DB can be found in the BLFS Book at <ulink
     url="&blfs-root;view/svn/server/databases.html#db"/>.</para>
 
-<screen><userinput>sed -i '/^TARGETS/s at arpd@@g' misc/Makefile</userinput></screen>
+<screen os="b"><userinput>sed -i '/^TARGETS/s at arpd@@g' misc/Makefile</userinput></screen>
 
-    <para>Prepare IPRoute2 for compilation:</para>
+    <para os="c">Prepare IPRoute2 for compilation:</para>
 
-<screen><userinput>sh configure </userinput></screen>
+<screen os="d"><userinput>sh configure </userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="e">Compile the package:</para>
 
 <screen><userinput>make SBINDIR=/sbin</userinput></screen>
 
-    <variablelist>
+    <variablelist os="f">
       <title>The meaning of the make option:</title>
 
       <varlistentry>
@@ -77,9 +77,9 @@
       </varlistentry>
     </variablelist>
 
-    <para>Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen><userinput>make SBINDIR=/sbin install</userinput></screen>
+<screen os="h"><userinput>make SBINDIR=/sbin install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/less.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/less.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/common/less.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -49,7 +49,7 @@
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin --sysconfdir=/etc</userinput></screen>
 
-    <variablelist>
+    <variablelist os="a">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>

Modified: branches/cross-lfs/BOOK/final-system/common/libtool.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/libtool.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/common/libtool.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -47,25 +47,25 @@
   <sect2 id="install-libtool" role="installation">
     <title>Installation of Libtool</title>
 
-    <para>Prepare Libtool for compilation:</para>
+    <para os="a">Prepare Libtool for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="b">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="c"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue:
+    <para os="d">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
-    <para>Correct the ownership of the <filename
+    <para os="g">Correct the ownership of the <filename
     class="libraryfile">libltdl</filename> data files:</para>
 
-<screen><userinput>chown -R root:root /usr/share/libtool/libltdl</userinput></screen>
+<screen os="h"><userinput>chown -R root:root /usr/share/libtool/libltdl</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/man.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/man.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/common/man.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -46,26 +46,26 @@
   <sect2 id="install-man" role="installation">
     <title>Installation of Man</title>
 
-    <para>A few adjustments need to be made to the sources of Man.</para>
+    <para os="a">A few adjustments need to be made to the sources of Man.</para>
 
-    <para>This a <command>sed</command> substitution to add the
+    <para os="b">This a <command>sed</command> substitution to add the
     <option>-R</option> switch to the <envar>PAGER</envar> variable so
     that escape sequences are properly handled by Less:</para>
 
-<screen><userinput>sed -i 's at -is@&R at g' configure</userinput></screen>
+<screen os="c"><userinput>sed -i 's at -is@&R at g' configure</userinput></screen>
 
-    <para>This a <command>sed</command> substitution to comment out the
+    <para os="d">This a <command>sed</command> substitution to comment out the
     <quote>MANPATH /usr/man</quote> line in the <filename>man.conf</filename>
     file to prevent redundant results when using programs such as
     <command>whatis</command>:</para>
 
-<screen><userinput>sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in</userinput></screen>
+<screen os="e"><userinput>sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in</userinput></screen>
 
-    <para>Prepare Man for compilation:</para>
+    <para os="f">Prepare Man for compilation:</para>
 
 <screen><userinput>./configure -confdir=/etc</userinput></screen>
 
-    <variablelist>
+    <variablelist os="g">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -78,15 +78,15 @@
       </varlistentry>
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="h">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="i"><userinput>make</userinput></screen>
 
-    <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>
 
-    <note>
+    <note os="l">
       <para>If you will be working on a terminal that does not support
       text attributes such as color and bold, you can disable Select
       Graphic Rendition (SGR) escape sequences by editing the
@@ -97,14 +97,14 @@
       that do not support SGR.</para>
     </note>
 
-    <para>If the character set of the locale uses 8-bit characters, search
+    <para os="m">If the character set of the locale uses 8-bit characters, search
     for the line beginning with <quote>NROFF</quote> in
     <filename>/etc/man.conf</filename>, and verify that it matches the
     following:</para>
 
-<screen>NROFF  /usr/bin/nroff -Tlatin1 -mandoc</screen>
+<screen os="n">NROFF  /usr/bin/nroff -Tlatin1 -mandoc</screen>
 
-    <para>Note that <quote>latin1</quote> should be used even if it is not
+    <para os="o">Note that <quote>latin1</quote> should be used even if it is not
     the character set of the locale. The reason is that, according to the
     specification, <command>groff</command> has no means of typesetting
     characters outside International Organization for Standards (ISO) 8859-1
@@ -116,14 +116,14 @@
     ormatted result is really in the same encoding as input, and therefore
     it is usable as the input for a pager.</para>
 
-    <para>This does not solve the problem of a non-working
+    <para os="p">This does not solve the problem of a non-working
     <command>man2dvi</command> program for localized man pages in
     non-ISO 8859-1 locales. Also, it does not work with multibyte
     character sets. The first problem does not currently have a solution.
     The second issue is not of concern because the LFS installation does
     not support multibyte character sets.</para>
 
-    <para>Additional information with regards to the compression of
+    <para os="q">Additional information with regards to the compression of
     man and info pages can be found in the BLFS book at
     <ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para>
 

Modified: branches/cross-lfs/BOOK/final-system/common/mktemp.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/mktemp.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/common/mktemp.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -45,17 +45,17 @@
   <sect2 id="install-mktemp" role="installation">
     <title>Installation of Mktemp</title>
 
-    <para>Many scripts still use the deprecated <command>tempfile</command>
+    <para os="a">Many scripts still use the deprecated <command>tempfile</command>
     program, which has functionality similar to <command>mktemp</command>.
     Patch Mktemp to include a <command>tempfile</command> wrapper:</para>
 
-<screen><userinput>patch -Np1 -i ../&mktemp-tempfile-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&mktemp-tempfile-patch;</userinput></screen>
 
-    <para>Prepare Mktemp for compilation:</para>
+    <para os="c">Prepare Mktemp for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
 
-    <variablelist>
+    <variablelist os="d">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -68,13 +68,13 @@
       </varlistentry>
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="e">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="f"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen><userinput>make install
+<screen os="h"><userinput>make install
 make install-tempfile</userinput></screen>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/final-system/multilib/introduction.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/introduction.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/multilib/introduction.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -12,26 +12,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/introduction.xml"
-    xpointer="xpointer(/sect1/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/introduction.xml"
-    xpointer="xpointer(/sect1/para[2])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/introduction.xml"
-    xpointer="xpointer(/sect1/para[3])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/introduction.xml"
-    xpointer="xpointer(/sect1/para[4])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/introduction.xml"
-    xpointer="xpointer(/sect1/para[5])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/introduction.xml"
-    xpointer="xpointer(/sect1/note[1])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/multilib/iproute2.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/iproute2.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/multilib/iproute2.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -44,27 +44,37 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
-    xpointer="xpointer(id('install-iproute2')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
-    xpointer="xpointer(id('install-iproute2')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare IPRoute2 for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>sh configure </userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>make CC="gcc ${BUILD64}" SBINDIR=/sbin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/iproute2.xml"
-    xpointer="xpointer(id('install-iproute2')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make SBINDIR=/sbin install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iproute2.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/less.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/less.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/multilib/less.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -49,7 +49,7 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/less.xml"
-    xpointer="xpointer(id('install-less')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <para>Compile the package:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/libtool-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/libtool-64bit.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/multilib/libtool-64bit.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -42,22 +42,41 @@
   <sect2 role="installation">
     <title>Installation of Libtool</title>
 
-    <para>Prepare Libtool for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    --libdir=/usr/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/multilib/libtool-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/libtool-n32.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/multilib/libtool-n32.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -42,21 +42,32 @@
   <sect2 role="installation">
     <title>Installation of Libtool</title>
 
-    <para>Prepare Libtool for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    --libdir=/usr/lib32</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/libtool.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/libtool.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/multilib/libtool.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -42,20 +42,31 @@
   <sect2 role="installation">
     <title>Installation of Libtool</title>
 
-    <para>Prepare Libtool for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make check</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/libtool.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/man.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/man.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/multilib/man.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -44,63 +44,73 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/para[2])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/screen[1])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/para[3])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/screen[2])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Prepare Man for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/man.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/note[1])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/para[7])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/screen[6])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/para[8])"/>
+    xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/para[9])"/>
+    xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/man.xml"
-    xpointer="xpointer(id('install-man')/para[10])"/>
+    xpointer="xpointer(//*[@os='q'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/mktemp.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/mktemp.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/multilib/mktemp.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -44,28 +44,37 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/mktemp.xml"
-    xpointer="xpointer(id('install-mktemp')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/mktemp.xml"
-    xpointer="xpointer(id('install-mktemp')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Mktemp for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --with-libc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/mktemp.xml"
-    xpointer="xpointer(id('install-mktemp')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install
-make install-tempfile</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/mktemp.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc/kbd.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/kbd.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/sparc/kbd.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -23,10 +23,10 @@
   <sect2 id="install-kbd" role="installation">
     <title>Installation of Kbd</title>
 
-    <para>Sparcs haven't updated the structure of kbd_rate yet, so
-    until they do this patch is required:</para>
+    <para os="a">Sparcs haven't updated the structure of <command>kbdrate</command>
+    yet, so until they do this patch is required:</para>
 
-<screen><userinput>patch -Np1 -i ../&kbd-sparc_kbdrate-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&kbd-sparc_kbdrate-patch;</userinput></screen>
 
     <para>Prepare Kbd for compilation:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/sparc64/kbd.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/kbd.xml	2005-08-20 13:21:02 UTC (rev 6731)
+++ branches/cross-lfs/BOOK/final-system/sparc64/kbd.xml	2005-08-20 18:38:35 UTC (rev 6732)
@@ -42,10 +42,13 @@
   <sect2 id="install-kbd" role="installation">
     <title>Installation of Kbd</title>
 
-    <para>Sparcs haven't updated the structure of kbd_rate yet, so
-    until they do this patch is required:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/kbd.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&kbd-sparc_kbdrate-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/kbd.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <para>Prepare Kbd for compilation:</para>
 




More information about the lfs-book mailing list