r6662 - in branches/cross-lfs/BOOK: . final-system/common final-system/multilib temp-system/64 temp-system/common temp-system/multilib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Aug 12 12:14:45 PDT 2005


Author: manuel
Date: 2005-08-12 13:14:42 -0600 (Fri, 12 Aug 2005)
New Revision: 6662

Modified:
   branches/cross-lfs/BOOK/final-system/common/aboutdebug.xml
   branches/cross-lfs/BOOK/final-system/common/autoconf.xml
   branches/cross-lfs/BOOK/final-system/common/automake.xml
   branches/cross-lfs/BOOK/final-system/common/bash.xml
   branches/cross-lfs/BOOK/final-system/multilib/aboutdebug.xml
   branches/cross-lfs/BOOK/final-system/multilib/autoconf.xml
   branches/cross-lfs/BOOK/final-system/multilib/automake.xml
   branches/cross-lfs/BOOK/final-system/multilib/bash.xml
   branches/cross-lfs/BOOK/general.ent
   branches/cross-lfs/BOOK/temp-system/64/bash.xml
   branches/cross-lfs/BOOK/temp-system/common/bash.xml
   branches/cross-lfs/BOOK/temp-system/multilib/bash.xml
Log:
Xinclude redo up to Bash.

Modified: branches/cross-lfs/BOOK/final-system/common/aboutdebug.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/aboutdebug.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/final-system/common/aboutdebug.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -8,7 +8,7 @@
 <sect1 id="ch-system-aboutdebug">
   <?dbhtml filename="aboutdebug.html"?>
 
-  <title>About Debugging Symbols</title>
+  <title os="a">About Debugging Symbols</title>
 
   <para>Most programs and libraries are, by default, compiled with debugging
   symbols included (with <command>gcc</command>'s <option>-g</option> option).
@@ -16,11 +16,11 @@
   debugging information included, the debugger can provide not only memory
   addresses, but also the names of the routines and variables.</para>
 
-  <para>However, the inclusion of these debugging symbols enlarges a
+  <para os="b">However, the inclusion of these debugging symbols enlarges a
   program or library significantly. The following is an example of the
   amount of space these symbols occupy:</para>
 
-  <itemizedlist>
+  <itemizedlist os="c">
     <listitem>
       <para>a bash binary with debugging symbols: 1200 KB</para>
     </listitem>
@@ -37,11 +37,11 @@
     </listitem>
   </itemizedlist>
 
-  <para>Sizes may vary depending on which compiler and C library were used,
+  <para os="d">Sizes may vary depending on which compiler and C library were used,
   but when comparing programs with and without debugging symbols, the
   difference will usually be a factor between two and five.</para>
 
-  <para>Because most users will never use a debugger on their system software,
+  <para os="e">Because most users will never use a debugger on their system software,
   a lot of disk space can be regained by removing these symbols. The next
   section shows how to strip all debugging symbols from the programs and
   libraries. Additional information on system optimization can be found at

Modified: branches/cross-lfs/BOOK/final-system/common/autoconf.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/autoconf.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/final-system/common/autoconf.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -53,7 +53,7 @@
 
 <screen><userinput>make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.
+    <para os="a">To test the results, issue: <userinput>make check</userinput>.
     This takes a long time, about 2 SBUs.</para>
 
     <para>Install the package:</para>

Modified: branches/cross-lfs/BOOK/final-system/common/automake.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/automake.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/final-system/common/automake.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -54,7 +54,7 @@
 
 <screen><userinput>make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.
+    <para os="a">To test the results, issue: <userinput>make check</userinput>.
     This takes a long time, about 5 SBUs.</para>
 
     <para>Install the package:</para>

Modified: branches/cross-lfs/BOOK/final-system/common/bash.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/common/bash.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/final-system/common/bash.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -45,30 +45,30 @@
   <sect2 id="install-bash" role="installation">
     <title>Installation of Bash</title>
 
-    <para>If you downloaded the Bash documentation tarball and wish to
+    <para os="a">If you downloaded the Bash documentation tarball and wish to
     install HTML documentation, issue the following commands:</para>
 
-<screen><userinput>tar -zxf ../bash-doc-&bash-doc-version;.tar.gz &&
+<screen os="b"><userinput>tar -zxf ../bash-doc-&bash-doc-version;.tar.gz &&
 sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     Makefile.in</userinput></screen>
 
-    <para>The following patch fixes various issues, including a problem where
+    <para os="c">The following patch fixes various issues, including a problem where
     Bash will sometimes only show 33 characters on a line, then wrap to the
     next:</para>
 
-<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+<screen os="d"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
-    <para>Bash also has issues when compiled against newer versions of Glibc.
+    <para os="e">Bash also has issues when compiled against newer versions of Glibc.
     The following patch resolves this problem:</para>
 
-<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
+<screen os="f"><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
 
-    <para>Prepare Bash for compilation:</para>
+    <para os="g">Prepare Bash for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin \
     --without-bash-malloc --with-installed-readline</userinput></screen>
 
-    <variablelist>
+    <variablelist os="h">
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
@@ -82,23 +82,23 @@
       </varlistentry>
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="i">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="j"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue:
+    <para os="k">To test the results, issue:
     <userinput>make tests</userinput>.</para>
 
-    <para>Install the package:</para>
+    <para os="l">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="m"><userinput>make install</userinput></screen>
 
-    <para>Run the newly compiled <command>bash</command> program (replacing
+    <para os="n">Run the newly compiled <command>bash</command> program (replacing
     the one that is currently being executed):</para>
 
-<screen><userinput>exec /bin/bash --login +h</userinput></screen>
+<screen os="o"><userinput>exec /bin/bash --login +h</userinput></screen>
 
-    <note>
+    <note os="p">
       <para>The parameters used make the <command>bash</command>
       process an interactive login shell and continue to disable hashing so
       that new programs are found as they become available.</para>

Modified: branches/cross-lfs/BOOK/final-system/multilib/aboutdebug.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/aboutdebug.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/final-system/multilib/aboutdebug.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -12,22 +12,22 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/aboutdebug.xml"
-    xpointer="xpointer(/sect1/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/aboutdebug.xml"
-    xpointer="xpointer(/sect1/para[2])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/aboutdebug.xml"
-    xpointer="xpointer(/sect1/itemizedlist[1])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/aboutdebug.xml"
-    xpointer="xpointer(/sect1/para[3])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/aboutdebug.xml"
-    xpointer="xpointer(/sect1/para[4])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
 </sect1>

Modified: branches/cross-lfs/BOOK/final-system/multilib/autoconf.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/autoconf.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/final-system/multilib/autoconf.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -50,8 +50,9 @@
 
 <screen><userinput>make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.
-    This takes a long time, about 2 SBUs.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/autoconf.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <para>Install the package:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/automake.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/automake.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/final-system/multilib/automake.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -50,8 +50,9 @@
 
 <screen><userinput>make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make check</userinput>.
-    This takes a long time, about 5 SBUs.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/automake.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
     <para>Install the package:</para>
 

Modified: branches/cross-lfs/BOOK/final-system/multilib/bash.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/multilib/bash.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/final-system/multilib/bash.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -44,29 +44,31 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/para[2])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/screen[2])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/para[3])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/screen[3])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Prepare Bash for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ./configure --prefix=/usr --bindir=/bin \
@@ -74,30 +76,39 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>To test the results, issue:
-    <userinput>make tests</userinput>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/para[7])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/screen[6])"/>
+    xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(id('install-bash')/note[1])"/>
+    xpointer="xpointer(//*[@os='p'])"/>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-12 19:14:42 UTC (rev 6662)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050811">
+<!ENTITY version "7.0-cross-lfs-20050812">
 <!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 11, 2005">
+<!ENTITY releasedate "August 12, 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/bash.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/64/bash.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/temp-system/64/bash.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -45,21 +45,23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(id('install-bash')/para[2])"/>
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(id('install-bash')/screen[2])"/>
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Prepare Bash for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-curses \
@@ -67,24 +69,32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/temp-system/common/bash.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/common/bash.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/temp-system/common/bash.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -43,25 +43,27 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
-    <para>Fix a minor issue during the build when cross-compling:</para>
+    <para os="aa">Fix a minor issue during the build when cross-compling:</para>
 
-<screen><userinput>cp -p Makefile.in Makefile.in.orig
+<screen os="ab"><userinput>cp -p Makefile.in Makefile.in.orig
 sed "s at size \$(Program)@${LFS_TARGET}-&@g"  Makefile.in.orig > Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(id('install-bash')/para[2])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(id('install-bash')/screen[2])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Prepare Bash for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/bash.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>./configure --prefix=/tools --with-curses \
    --without-bash-malloc --host=${LFS_TARGET}</userinput></screen>
 
-    <variablelist>
+    <variablelist os="ac">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -83,21 +85,27 @@
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/bash.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/bash.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/bash.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/bash.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <para>Make a link for the programs that use <command>sh</command> for
+    <para os="ad">Make a link for the programs that use <command>sh</command> for
     a shell:</para>
 
-<screen><userinput>ln -s bash /tools/bin/sh</userinput></screen>
+<screen os="ae"><userinput>ln -s bash /tools/bin/sh</userinput></screen>
 
-    <para/>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/temp-system/multilib/bash.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-system/multilib/bash.xml	2005-08-12 18:11:51 UTC (rev 6661)
+++ branches/cross-lfs/BOOK/temp-system/multilib/bash.xml	2005-08-12 19:14:42 UTC (rev 6662)
@@ -45,21 +45,23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/para[1])"/>
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[1])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(id('install-bash')/para[2])"/>
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(id('install-bash')/screen[2])"/>
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Prepare Bash for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-curses \
@@ -67,24 +69,32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/variablelist[1])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/para[4])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[4])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/para[5])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@role='installation']/screen[5])"/>
+    xpointer="xpointer(//*[@os='m'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='ae'])"/>
+
   </sect2>
 
   <sect2 role="content">




More information about the lfs-book mailing list