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

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Aug 21 03:40:33 PDT 2005


Author: manuel
Date: 2005-08-21 04:40:29 -0600 (Sun, 21 Aug 2005)
New Revision: 6734

Modified:
   branches/cross-lfs/BOOK/boot/64/module-init-tools.xml
   branches/cross-lfs/BOOK/boot/common/module-init-tools.xml
   branches/cross-lfs/BOOK/boot/multilib/module-init-tools.xml
   branches/cross-lfs/BOOK/final-system/common/module-init-tools.xml
   branches/cross-lfs/BOOK/final-system/common/ncurses.xml
   branches/cross-lfs/BOOK/final-system/common/perl.xml
   branches/cross-lfs/BOOK/final-system/multilib/module-init-tools.xml
   branches/cross-lfs/BOOK/final-system/multilib/ncurses-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/ncurses-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/ncurses.xml
   branches/cross-lfs/BOOK/final-system/multilib/perl-64bit.xml
   branches/cross-lfs/BOOK/final-system/multilib/perl-n32.xml
   branches/cross-lfs/BOOK/final-system/multilib/perl.xml
   branches/cross-lfs/BOOK/general.ent
   branches/cross-lfs/BOOK/temp-system/64/ncurses.xml
   branches/cross-lfs/BOOK/temp-system/common/ncurses.xml
   branches/cross-lfs/BOOK/temp-system/multilib/ncurses-64bit.xml
   branches/cross-lfs/BOOK/temp-system/multilib/ncurses-n32.xml
   branches/cross-lfs/BOOK/temp-system/multilib/ncurses.xml
   branches/cross-lfs/BOOK/temp-tools/64/perl-64bit.xml
   branches/cross-lfs/BOOK/temp-tools/common/perl.xml
   branches/cross-lfs/BOOK/temp-tools/multilib/perl-64bit.xml
   branches/cross-lfs/BOOK/temp-tools/multilib/perl-n32.xml
   branches/cross-lfs/BOOK/temp-tools/multilib/perl.xml
Log:
Xinclude redo up to Perl.

Modified: branches/cross-lfs/BOOK/boot/64/module-init-tools.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/64/module-init-tools.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/boot/64/module-init-tools.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -43,22 +43,37 @@
   <sect2 role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-    <para>Prepare Module-Init-Tools for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
    --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make DOCBOOKTOMAN="" LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>The <command>DOCBOOKTOMAN</command> option allows the compile process
-    to complete without regenerating the man pages.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make DESTDIR="${LFS}" install</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/boot/common/module-init-tools.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/common/module-init-tools.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/boot/common/module-init-tools.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -43,22 +43,33 @@
   <sect2 role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-    <para>Prepare Module-Init-Tools for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
 <screen><userinput>./configure --prefix=/ \
    --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make DOCBOOKTOMAN="" LDFLAGS="-s"</userinput></screen>
+<screen os="f"><userinput>make LDFLAGS="-s"</userinput></screen>
 
-    <para>The <command>DOCBOOKTOMAN</command> option allows the compile process
-    to complete without regenerating the man pages.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Install the package:</para>
+<screen os="i"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
 
-<screen><userinput>make DESTDIR="${LFS}" install</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/boot/multilib/module-init-tools.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/multilib/module-init-tools.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/boot/multilib/module-init-tools.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -43,22 +43,37 @@
   <sect2 role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-    <para>Prepare Module-Init-Tools for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
 <screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
    --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make DOCBOOKTOMAN="" LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>The <command>DOCBOOKTOMAN</command> option allows the compile process
-    to complete without regenerating the man pages.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make DESTDIR="${LFS}" install</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/final-system/common/module-init-tools.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/module-init-tools.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/common/module-init-tools.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -46,19 +46,19 @@
   <sect2 id="install-module-init-tools" role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-    <para>Module-Init-Tools attempts to rewrite its
+    <para os="a">Module-Init-Tools attempts to rewrite its
     <filename>modprobe.conf</filename> man page during the build process.
     This is unnecessary and also relies on <command>docbook2man</command>
     — which is not installed in LFS. Run the following command to
     avoid this:</para>
 
-<screen><userinput>touch modprobe.conf.5</userinput></screen>
+<screen os="b"><userinput>touch modprobe.conf.5</userinput></screen>
 
-    <para>Prepare Module-Init-Tools for compilation:</para>
+    <para os="c">Prepare Module-Init-Tools for compilation:</para>
 
 <screen><userinput>./configure --prefix="" --enable-zlib</userinput></screen>
 
-    <variablelist>
+    <variablelist os="d">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -71,16 +71,16 @@
 
     </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>To test the results, issue:
+    <para os="g">To test the results, issue:
     <userinput>make check</userinput>.</para>
 
-    <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>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/ncurses.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/ncurses.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/common/ncurses.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -46,36 +46,36 @@
   <sect2 id="install-ncurses" role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <para os="a">Prepare Ncurses for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libdir=/lib \
     --with-shared --without-debug</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>This package does not come with a test suite.</para>
+    <para os="d">This package does not come with a test suite.</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>Move the Ncurses static libraries to the proper locations:</para>
+    <para os="g">Move the Ncurses static libraries to the proper locations:</para>
 
-<screen><userinput>mv /lib/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib</userinput></screen>
+<screen os="h"><userinput>mv /lib/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib</userinput></screen>
 
-    <para>Create symlinks in <filename class="directory">/usr/lib:</filename></para>
+    <para os="i">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
 
-<screen><userinput>rm /lib/lib{ncurses,menu,panel,form}.so
+<screen os="j"><userinput>rm /lib/lib{ncurses,menu,panel,form}.so
 ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
 ln -sf ../../lib/libmenu.so.5 /usr/lib/libmenu.so
 ln -sf ../../lib/libpanel.so.5 /usr/lib/libpanel.so
 ln -sf ../../lib/libform.so.5 /usr/lib/libform.so</userinput></screen>
 
-    <para>Give the Ncurses libraries execute permissions:</para>
+    <para os="k">Give the Ncurses libraries execute permissions:</para>
 
-<screen><userinput>chmod 755 /lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
+<screen os="l"><userinput>chmod 755 /lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/common/perl.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/perl.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/common/perl.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -46,14 +46,14 @@
   <sect2 id="install-perl" role="installation">
     <title>Installation of Perl</title>
 
-    <para>To have full control over the way Perl is set up, run the
+    <para os="a">To have full control over the way Perl is set up, run the
     interactive <command>Configure</command> script and hand-pick the way
     this package is built. If the defaults it auto-detects are suitable,
     prepare Perl for compilation with:</para>
 
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
 
-    <variablelist>
+    <variablelist os="b">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -65,23 +65,23 @@
       </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>To run the test suite, first create a basic
+    <para os="e">To run the test suite, first create a basic
     <filename>/etc/hosts</filename> file which is needed by a couple of
     the tests to resolve the network name localhost:</para>
 
-<screen><userinput>echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
+<screen os="f"><userinput>echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
 
-    <para>Now run the tests, if desired:</para>
+    <para os="g">Now run the tests, if desired:</para>
 
-<screen><userinput>make test</userinput></screen>
+<screen os="h"><userinput>make test</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="i">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="j"><userinput>make install</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/module-init-tools.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/module-init-tools.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/multilib/module-init-tools.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -42,28 +42,44 @@
   <sect2 role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-<para>Module-Init-Tools attempts to rewrite its
-<filename>modprobe.conf</filename> man page during the build process. This is
-unnecessary and also relies on <command>docbook2man</command> — which is not
-installed in LFS. Run the following command to avoid this:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>touch modprobe.conf.5</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Module-Init-Tools for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix="" --enable-zlib</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.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/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/ncurses-64bit.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/multilib/ncurses-64bit.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -42,22 +42,38 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    ./configure --prefix=/usr --libdir=/lib64 \
    --with-shared --without-debug</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Move the Ncurses static libraries to the proper locations:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
 <screen><userinput>mv /lib64/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib64</userinput></screen>
 
     <para>Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
@@ -68,7 +84,9 @@
 ln -sf ../../lib64/libpanel.so.5 /usr/lib64/libpanel.so
 ln -sf ../../lib64/libform.so.5 /usr/lib64/libform.so</userinput></screen>
 
-    <para>Give the Ncurses libraries execute permissions:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><userinput>chmod 755 /lib64/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/ncurses-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/ncurses-n32.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/multilib/ncurses-n32.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -42,33 +42,51 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
    ./configure --prefix=/usr --libdir=/lib32 \
    --with-shared --without-debug</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Move the Ncurses static libraries to the proper locations:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>mv /lib32/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Create symlinks in <filename class="directory">/usr/lib:</filename></para>
+<screen><userinput>mv /lib32/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib32</userinput></screen>
 
+    <para>Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
+
 <screen><userinput>rm /lib32/lib{ncurses,menu,panel,form}.so
 ln -sf ../../lib32/libncurses.so.5 /usr/lib32/libncurses.so
 ln -sf ../../lib32/libmenu.so.5 /usr/lib32/libmenu.so
 ln -sf ../../lib32/libpanel.so.5 /usr/lib32/libpanel.so
 ln -sf ../../lib32/libform.so.5 /usr/lib32/libform.so</userinput></screen>
 
-    <para>Give the Ncurses libraries execute permissions:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><userinput>chmod 755 /lib32/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/ncurses.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/ncurses.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/multilib/ncurses.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -42,36 +42,58 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
    ./configure --prefix=/usr --libdir=/lib \
    --with-shared --without-debug</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Move the Ncurses static libraries to the proper locations:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>mv /lib/lib{panel,menu,form,ncurses,ncurses++}.a /usr/lib</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Create symlinks in <filename class="directory">/usr/lib:</filename></para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>rm /lib/lib{ncurses,menu,panel,form}.so
-ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
-ln -sf ../../lib/libmenu.so.5 /usr/lib/libmenu.so
-ln -sf ../../lib/libpanel.so.5 /usr/lib/libpanel.so
-ln -sf ../../lib/libform.so.5 /usr/lib/libform.so</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>Give the Ncurses libraries execute permissions:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen><userinput>chmod 755 /lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/final-system/multilib/perl-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/perl-64bit.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/multilib/perl-64bit.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -49,35 +49,35 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
    -Dcc="gcc ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/para[3])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/screen[3])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>Now run the tests, if desired:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen><userinput>make test</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/multilib/perl-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/perl-n32.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/multilib/perl-n32.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -49,35 +49,35 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
    -Dcc="gcc ${BUILDN32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/para[3])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/screen[3])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>Now run the tests, if desired:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-<screen><userinput>make test</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/final-system/multilib/perl.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/perl.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/final-system/multilib/perl.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -44,34 +44,46 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
    -Dcc="gcc ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/para[3])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(id('install-perl')/screen[3])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now run the tests, if desired:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make test</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-21 10:40:29 UTC (rev 6734)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050820">
+<!ENTITY version "7.0-cross-lfs-20050821">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64">
 <!ENTITY version-ppc "&version;-PowerPC">
@@ -8,7 +8,7 @@
 <!ENTITY version-mips "&version;-MIPS">
 <!ENTITY version-mips64 "&version;-MIPS64">
 
-<!ENTITY releasedate "August 20, 2005">
+<!ENTITY releasedate "August 21, 2005">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 

Modified: branches/cross-lfs/BOOK/temp-system/64/ncurses.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/ncurses.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-system/64/ncurses.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -45,13 +45,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-shared \
@@ -60,15 +62,23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/common/ncurses.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/ncurses.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-system/common/ncurses.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -43,21 +43,23 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>When cross-compiling, Ncurses doesn't always properly create
+    <para os="aa">When cross-compiling, Ncurses doesn't always properly create
     the file <filename>ncurses/comp_captab.c</filename> which results
     in build failures. Fix this issue by updating Ncurses with a rollup
     patch released on 2005/03/19:</para>
 
-<screen><userinput>bzcat ../&ncurses-update-patch; > update.sh
+<screen os="ab"><userinput>bzcat ../&ncurses-update-patch; > update.sh
 sh update.sh</userinput></screen>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/ncurses.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc</userinput></screen>
 
-    <variablelist>
+    <variablelist os="ac">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -103,13 +105,21 @@
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/ncurses.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/ncurses.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/ncurses.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/ncurses-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/ncurses-64bit.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-system/multilib/ncurses-64bit.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -45,26 +45,36 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc --libdir=/tools/lib64</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/ncurses-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/ncurses-n32.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-system/multilib/ncurses-n32.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -45,26 +45,36 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc --libdir=/tools/lib32</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/ncurses.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-system/multilib/ncurses.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -45,13 +45,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
-    <para>Prepare Ncurses for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD32}" CXX="${CXX} ${BUILD32}" \
    ./configure --prefix=/tools --with-shared \
@@ -60,15 +62,23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-tools/64/perl-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/64/perl-64bit.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-tools/64/perl-64bit.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -45,33 +45,43 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='IO Fcntl POSIX' \
    -Dcc="gcc ${BUILD64}"</userinput></screen>
 
-    <para>Compile only the required tools:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
 
-<screen><userinput>make perl utilities</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='af'])"/>
 
-    <para>Copy these tools and their libraries:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
 
-<screen><userinput>cp perl pod/pod2man /tools/bin
-install -d /tools/lib/perl5/&perl-version;
-cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ai'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/temp-tools/common/perl.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/common/perl.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-tools/common/perl.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -43,17 +43,17 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
 
-    <para>First adapt some hard-wired paths to the C library by applying
+    <para os="aa">First adapt some hard-wired paths to the C library by applying
     the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
+<screen os="ab"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
 
-    <para>Prepare Perl for compilation (make sure to get the 'IO Fcntl POSIX'
+    <para os="ac">Prepare Perl for compilation (make sure to get the 'IO Fcntl POSIX'
     part of the command correct—they are all letters):</para>
 
 <screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='IO Fcntl POSIX'</userinput></screen>
 
-    <variablelist>
+    <variablelist os="ad">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -67,18 +67,18 @@
 
     </variablelist>
 
-    <para>Only a few of the utilities contained in this package need to be
+    <para os="ae">Only a few of the utilities contained in this package need to be
     built:</para>
 
-<screen><userinput>make perl utilities</userinput></screen>
+<screen os="af"><userinput>make perl utilities</userinput></screen>
 
-    <para>Although Perl comes with a test suite, it is not recommended to
+    <para os="ag">Although Perl comes with a test suite, it is not recommended to
     run it at this point. Only part of Perl was built and running
     <userinput>make test</userinput> now will cause the rest of Perl to be
     built as well, which is unnecessary at this point. The test suite can
     be run in the next chapter if desired.</para>
 
-    <para>Install these tools and their libraries:</para>
+    <para os="ah">Install these tools and their libraries:</para>
 
 <screen><userinput>cp perl pod/pod2man /tools/bin
 install -d /tools/lib/perl5/&perl-version;

Modified: branches/cross-lfs/BOOK/temp-tools/multilib/perl-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/multilib/perl-64bit.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-tools/multilib/perl-64bit.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -45,11 +45,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <para>Make sure Perl looks at <filename
     class="directory">/tools/lib64</filename> for shared libraries:</para>
@@ -58,20 +58,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='IO Fcntl POSIX' \
    -Dcc="gcc ${BUILD64}"</userinput></screen>
 
-    <para>Compile only the required tools:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make perl utilities</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='ag'])"/>
 
-    <para>Copy these tools and their libraries:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
 
 <screen><userinput>cp perl pod/pod2man /tools/bin
 install -d /tools/lib64/perl5/&perl-version;

Modified: branches/cross-lfs/BOOK/temp-tools/multilib/perl-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/multilib/perl-n32.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-tools/multilib/perl-n32.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -45,11 +45,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <para>Make sure Perl looks at <filename
     class="directory">/tools/lib32</filename> for shared libraries:</para>
@@ -58,23 +58,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='IO Fcntl POSIX' \
    -Dcc="gcc ${BUILDN32}"</userinput></screen>
 
-    <para>Compile only the required tools:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make perl utilities</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='ag'])"/>
 
-    <para>Copy these tools and their libraries:</para>
+    <para>Install the libraries:</para>
 
-<screen><userinput>cp perl pod/pod2man /tools/bin
-install -d /tools/lib32/perl5/&perl-version;
+<screen><userinput>install -d /tools/lib32/perl5/&perl-version;
 cp -R lib/* /tools/lib32/perl5/&perl-version;</userinput></screen>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/temp-tools/multilib/perl.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/multilib/perl.xml	2005-08-21 02:11:25 UTC (rev 6733)
+++ branches/cross-lfs/BOOK/temp-tools/multilib/perl.xml	2005-08-21 10:40:29 UTC (rev 6734)
@@ -45,32 +45,36 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[2])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
 <screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='IO Fcntl POSIX' \
    -Dcc="gcc ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
-    <para>Compile only the required tools:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
 
-<screen><userinput>make perl utilities</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='ag'])"/>
 
-    <para>Copy these tools and their libraries:</para>
+    <para>Intall the libraries:</para>
 
 <screen><userinput>install -d /tools/lib/perl5/&perl-version;
 cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>




More information about the lfs-book mailing list