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

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Aug 20 06:21:03 PDT 2005


Author: manuel
Date: 2005-08-20 07:21:02 -0600 (Sat, 20 Aug 2005)
New Revision: 6731

Modified:
   branches/cross-lfs/BOOK/boot/64/inetutils.xml
   branches/cross-lfs/BOOK/boot/common/inetutils.xml
   branches/cross-lfs/BOOK/boot/multilib/inetutils.xml
   branches/cross-lfs/BOOK/final-system/common/groff.xml
   branches/cross-lfs/BOOK/final-system/common/gzip.xml
   branches/cross-lfs/BOOK/final-system/common/inetutils.xml
   branches/cross-lfs/BOOK/final-system/multilib/groff.xml
   branches/cross-lfs/BOOK/final-system/multilib/gzip.xml
   branches/cross-lfs/BOOK/final-system/multilib/inetutils.xml
   branches/cross-lfs/BOOK/temp-system/64/gzip.xml
   branches/cross-lfs/BOOK/temp-system/common/gzip.xml
   branches/cross-lfs/BOOK/temp-system/multilib/gzip.xml
Log:
Xinclude redo up to Inetutils.

Modified: branches/cross-lfs/BOOK/boot/64/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/64/inetutils.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/boot/64/inetutils.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -44,14 +44,16 @@
     <title>Installation of Inetutils</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/para[1])"/>
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/screen[1])"/>
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<para>Prepare Inetutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/usr --libexecdir=/usr/sbin \
@@ -60,16 +62,24 @@
    --disable-whois --disable-servers</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/variablelist[1])"/>
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/common/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/inetutils.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/boot/common/inetutils.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -45,13 +45,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<para>Prepare Inetutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/inetutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
     --host=${LFS_TARGET} --sysconfdir=/etc --disable-logger \
@@ -59,15 +61,19 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/inetutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make LDFLAGS="-s"</userinput></screen>
+<screen os="aa"><userinput>make LDFLAGS="-s"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/inetutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/boot/multilib/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/inetutils.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/boot/multilib/inetutils.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -44,14 +44,16 @@
     <title>Installation of Inetutils</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/para[1])"/>
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/screen[1])"/>
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<para>Prepare Inetutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/usr --libexecdir=/usr/sbin \
@@ -60,16 +62,24 @@
    --disable-whois --disable-servers</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/variablelist[1])"/>
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/groff.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/groff.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/final-system/common/groff.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -46,27 +46,27 @@
   <sect2 id="install-groff" role="installation">
     <title>Installation of Groff</title>
 
-    <para>Groff expects the environment variable <envar>PAGE</envar>
+    <para os="a">Groff expects the environment variable <envar>PAGE</envar>
     to contain the default paper size. For users in the United States,
     <parameter>PAGE=letter</parameter> is appropriate. Elsewhere,
     <parameter>PAGE=A4</parameter> may be more suitable.</para>
 
-    <para>Prepare Groff for compilation:</para>
+    <para os="b">Prepare Groff for compilation:</para>
 
 <screen><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr</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>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>Some documentation programs, such as <command>xman</command>,
+    <para os="g">Some documentation programs, such as <command>xman</command>,
     will not work properly without the following symlinks:</para>
 
-<screen><userinput>ln -s soelim /usr/bin/zsoelim
+<screen os="h"><userinput>ln -s soelim /usr/bin/zsoelim
 ln -s eqn /usr/bin/geqn
 ln -s tbl /usr/bin/gtbl</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/final-system/common/gzip.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/gzip.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/final-system/common/gzip.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -46,37 +46,37 @@
   <sect2 id="install-gzip" role="installation">
     <title>Installation of Gzip</title>
 
-    <para>The following patch fixes two security vulnerabilities in Gzip.
+    <para os="a">The following patch fixes two security vulnerabilities in Gzip.
     First, a path traversal bug when using the <option>-N</option> option
     (CAN-2005-1228) Second, a race condition in the file permission restore
     code (CAN-2005-0998)</para>
 
-<screen><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>
 
-    <para>Prepare Gzip for compilation:</para>
+    <para os="c">Prepare Gzip for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-    <para>The <command>gzexe</command> script has the location of the
+    <para os="d">The <command>gzexe</command> script has the location of the
     <command>gzip</command> binary hard-wired into it. Because the
     location of the binary is changed later, the following command ensures
     that the new location gets placed into the script:</para>
 
-<screen><userinput>sed -i 's@"BINDIR"@/bin at g' gzexe.in</userinput></screen>
+<screen os="e"><userinput>sed -i 's@"BINDIR"@/bin at g' gzexe.in</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="f">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="h">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="i"><userinput>make install</userinput></screen>
 
-    <para>Move the <command>gzip</command> program to the <filename
+    <para os="j">Move the <command>gzip</command> program to the <filename
     class="directory">/bin</filename> directory and create some commonly
     used symlinks to it:</para>
 
-<screen><userinput>mv /usr/bin/gzip /bin
+<screen os="k"><userinput>mv /usr/bin/gzip /bin
 rm /usr/bin/{gunzip,zcat}
 ln -s gzip /bin/gunzip
 ln -s gzip /bin/zcat

Modified: branches/cross-lfs/BOOK/final-system/common/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/inetutils.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/final-system/common/inetutils.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -45,21 +45,21 @@
   <sect2 id="install-inetutils" role="installation">
     <title>Installation of Inetutils</title>
 
-    <para>All programs that come with Inetutils will not be installed.
+    <para os="a">All programs that come with Inetutils will not be installed.
     However, the Inetutils build system will insist on installing all the
     man pages anyway. The following patch will correct this
     situation:</para>
 
-<screen><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
 
-    <para>Prepare Inetutils for compilation:</para>
+    <para os="c">Prepare Inetutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
     --sysconfdir=/etc --localstatedir=/var \
     --disable-logger --disable-syslogd \
     --disable-whois --disable-servers</userinput></screen>
 
-    <variablelist>
+    <variablelist os="d">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -105,18 +105,18 @@
       </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</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
-    <para>Move the <command>ping</command> program to its FHS-compliant
+    <para os="i">Move the <command>ping</command> program to its FHS-compliant
     place:</para>
 
-<screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
+<screen os="j"><userinput>mv /usr/bin/ping /bin</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/groff.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/groff.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/final-system/multilib/groff.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -44,28 +44,38 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/groff.xml"
-    xpointer="xpointer(id('install-groff')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare Groff for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/groff.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>PAGE=<replaceable>[paper_size]</replaceable> CC="gcc ${BUILD64}" \
    CXX="g++ ${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/groff.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/groff.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/groff.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/groff.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/groff.xml"
-    xpointer="xpointer(id('install-groff')/para[5])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/groff.xml"
-    xpointer="xpointer(id('install-groff')/screen[4])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/gzip.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/gzip.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/final-system/multilib/gzip.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -44,39 +44,49 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(id('install-gzip')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(id('install-gzip')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Gzip for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(id('install-gzip')/para[3])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(id('install-gzip')/screen[3])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(id('install-gzip')/para[6])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(id('install-gzip')/screen[6])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/inetutils.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/inetutils.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/final-system/multilib/inetutils.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -44,13 +44,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Inetutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libexecdir=/usr/sbin \
     --sysconfdir=/etc --localstatedir=/var \
@@ -59,20 +61,31 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(id('install-inetutils')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Move the <command>ping</command> program to its FHS-compliant
-    place:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/64/gzip.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/gzip.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/temp-system/64/gzip.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -45,24 +45,34 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Prepare Gzip for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
   --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/gzip.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/gzip.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/temp-system/common/gzip.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -43,23 +43,33 @@
   <sect2 role="installation">
     <title>Installation of Gzip</title>
 
-    <para>Setup <command>configure</command> so it can use cross-compiled
+    <para os="aa">Setup <command>configure</command> so it can use cross-compiled
     tools:</para>
 
-<screen><userinput>sed -i "s at nm conftest@${LFS_TARGET}-&@" configure</userinput></screen>
+<screen os="ab"><userinput>sed -i "s at nm conftest@${LFS_TARGET}-&@" configure</userinput></screen>
 
-    <para>Prepare Gzip for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gzip.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gzip.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gzip.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gzip.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gzip.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/gzip.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/gzip.xml	2005-08-20 11:50:24 UTC (rev 6730)
+++ branches/cross-lfs/BOOK/temp-system/multilib/gzip.xml	2005-08-20 13:21:02 UTC (rev 6731)
@@ -45,24 +45,34 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gzip.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Prepare Gzip for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
   --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gzip.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
 




More information about the lfs-book mailing list