r6759 - in branches/cross-lfs/BOOK: . temp-tools/64 temp-tools/common temp-tools/multilib

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Aug 27 02:49:05 PDT 2005


Author: manuel
Date: 2005-08-27 03:49:04 -0600 (Sat, 27 Aug 2005)
New Revision: 6759

Modified:
   branches/cross-lfs/BOOK/general.ent
   branches/cross-lfs/BOOK/temp-tools/64/expect-64bit.xml
   branches/cross-lfs/BOOK/temp-tools/64/tcl-64bit.xml
   branches/cross-lfs/BOOK/temp-tools/common/dejagnu.xml
   branches/cross-lfs/BOOK/temp-tools/common/expect.xml
   branches/cross-lfs/BOOK/temp-tools/common/tcl.xml
   branches/cross-lfs/BOOK/temp-tools/multilib/expect-64bit.xml
   branches/cross-lfs/BOOK/temp-tools/multilib/tcl-64bit.xml
Log:
Xinclude redo on temp-tools/.

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-08-26 20:08:33 UTC (rev 6758)
+++ branches/cross-lfs/BOOK/general.ent	2005-08-27 09:49:04 UTC (rev 6759)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050826">
+<!ENTITY version "7.0-cross-lfs-20050827">
 <!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 26, 2005">
+<!ENTITY releasedate "August 27, 2005">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 

Modified: branches/cross-lfs/BOOK/temp-tools/64/expect-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/64/expect-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
+++ branches/cross-lfs/BOOK/temp-tools/64/expect-64bit.xml	2005-08-27 09:49:04 UTC (rev 6759)
@@ -16,11 +16,12 @@
     <primary sortas="a-Expect">Expect 64 Bit</primary>
   </indexterm>
 
-  <sect2 id="package-expect" role="package">
+  <sect2 role="package">
     <title/>
 
-    <para>The Expect package contains a program for carrying out scripted
-    dialogues with other interactive programs.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(id('package-expect')/para[1])"/>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -32,141 +33,74 @@
       </seglistitem>
     </segmentedlist>
 
-    <segmentedlist>
-      <segtitle>&dependencies;</segtitle>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(id('package-expect')/segmentedlist[2])"/>
 
-      <seglistitem>
-        <seg>Bash, Binutils, Coreutils, Diffutils,
-        GCC, Glibc, Grep, Make, Sed, and Tcl</seg>
-      </seglistitem>
-    </segmentedlist>
-
   </sect2>
 
-  <sect2 id="install-expect" role="installation">
+  <sect2 role="installation">
     <title>Installation of Expect</title>
 
-    <para>First, fix a bug that can result in false failures during the GCC
-    test suite run:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Now prepare Expect for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
    --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the configure options:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-      <varlistentry>
-        <term><parameter>--with-tcl=/tools/lib</parameter></term>
-        <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary temp-tools location.</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-      <varlistentry>
-        <term><parameter>--with-tclinclude=$TCLPATH</parameter></term>
-        <listitem>
-          <para>This explicitly tells Expect where to find Tcl's source
-          directory and internal headers. Using this option avoids conditions
-          where <command>configure</command> fails because it cannot
-          automatically discover the location of the Tcl source directory.</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-      <varlistentry>
-        <term><parameter>--with-x=no</parameter></term>
-        <listitem>
-          <para>This tells the configure script not to search for Tk
-          (the Tcl GUI component) or the X Window System libraries, both of
-          which may reside on the host system but will not exist when
-          building the final system.</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Build the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>To test the results, issue: <userinput>make test</userinput>.
-    Note that the Expect test suite is known to experience failures under
-    certain host conditions that are not within our control. Therefore,
-    test suite failures here are not surprising and are not considered
-    critical.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-<screen><userinput>make SCRIPTS="" install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <variablelist>
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>SCRIPTS=""</parameter></term>
-        <listitem>
-          <para>This prevents installation of the supplementary expect
-          scripts, which are not needed.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Now remove the <envar>TCLPATH</envar> variable:</para>
-
-<screen><userinput>unset TCLPATH</userinput></screen>
-
-    <para>The source directories of both Tcl and Expect can now
-    be removed.</para>
-
   </sect2>
 
-  <sect2 id="contents-expect" role="content">
-    <title>Contents of Expect</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(id('contents-expect'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>expect</seg>
-        <seg>libexpect-&expect-lib-version;.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="expect">
-        <term><command>expect</command></term>
-        <listitem>
-          <para>Communicates with other interactive programs according
-          to a script</para>
-          <indexterm zone="ch-temp-tools-expect expect">
-            <primary sortas="b-expect">expect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpect">
-        <term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
-        <listitem>
-          <para>Contains functions that allow Expect to be used as a Tcl
-          extension or to be used directly from C or C++ (without Tcl)</para>
-          <indexterm zone="ch-temp-tools-expect libexpect">
-            <primary sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/temp-tools/64/tcl-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/64/tcl-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
+++ branches/cross-lfs/BOOK/temp-tools/64/tcl-64bit.xml	2005-08-27 09:49:04 UTC (rev 6759)
@@ -44,92 +44,59 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(id('install-tcl')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<para>Prepare Tcl for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cd unix
 CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
 
-    <para>Build the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(id('install-tcl')/para[4])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(id('install-tcl')/warning[1])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(id('install-tcl')/para[6])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>cd ..
-export TCLPATH=`pwd`</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>Now make a necessary symbolic link:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>
 
-  <sect2 id="contents-tcl" role="content">
-    <title>Contents of Tcl</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/tcl.xml"
+  xpointer="xpointer(id('contents-tcl'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>tclsh (link to tclsh8.4) and tclsh8.4</seg>
-        <seg>libtcl8.4.so</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tclsh8.4">
-        <term><command>tclsh8.4</command></term>
-        <listitem>
-          <para>The Tcl command shell</para>
-          <indexterm zone="ch-temp-tools-tcl tclsh8.4">
-            <primary sortas="b-tclsh8.4">tclsh8.4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh">
-        <term><command>tclsh</command></term>
-        <listitem>
-          <para>A link to tclsh8.4</para>
-          <indexterm zone="ch-temp-tools-tcl tclsh">
-            <primary sortas="b-tclsh">tclsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtcl8.4.so">
-        <term><filename class="libraryfile">libtcl8.4.so</filename></term>
-        <listitem>
-          <para>The Tcl library</para>
-          <indexterm zone="ch-temp-tools-tcl libtcl8.4.so">
-            <primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>

Modified: branches/cross-lfs/BOOK/temp-tools/common/dejagnu.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/common/dejagnu.xml	2005-08-26 20:08:33 UTC (rev 6758)
+++ branches/cross-lfs/BOOK/temp-tools/common/dejagnu.xml	2005-08-27 09:49:04 UTC (rev 6759)
@@ -43,7 +43,7 @@
 
   </sect2>
 
-  <sect2 id="install-dejagnu" role="installation">
+  <sect2 role="installation">
     <title>Installation of DejaGNU</title>
 
     <para>Prepare DejaGNU for compilation:</para>

Modified: branches/cross-lfs/BOOK/temp-tools/common/expect.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/common/expect.xml	2005-08-26 20:08:33 UTC (rev 6758)
+++ branches/cross-lfs/BOOK/temp-tools/common/expect.xml	2005-08-27 09:49:04 UTC (rev 6759)
@@ -43,20 +43,20 @@
 
   </sect2>
 
-  <sect2 id="install-expect" role="installation">
+  <sect2 role="installation">
     <title>Installation of Expect</title>
 
-    <para>First, fix a bug that can result in false failures during the GCC
+    <para os="a">First, fix a bug that can result in false failures during the GCC
     test suite run:</para>
 
-<screen><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
 
-    <para>Now prepare Expect for compilation:</para>
+    <para os="c">Now prepare Expect for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
    --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
 
-    <variablelist>
+    <variablelist os="d">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -89,21 +89,21 @@
 
     </variablelist>
 
-    <para>Build the package:</para>
+    <para os="e">Build the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="f"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>make test</userinput>.
+    <para os="g">To test the results, issue: <userinput>make test</userinput>.
     Note that the Expect test suite is known to experience failures under
     certain host conditions that are not within our control. Therefore,
     test suite failures here are not surprising and are not considered
     critical.</para>
 
-    <para>Install the package:</para>
+    <para os="h">Install the package:</para>
 
-<screen><userinput>make SCRIPTS="" install</userinput></screen>
+<screen os="i"><userinput>make SCRIPTS="" install</userinput></screen>
 
-    <variablelist>
+    <variablelist os="j">
       <title>The meaning of the make parameter:</title>
 
       <varlistentry>
@@ -116,11 +116,11 @@
 
     </variablelist>
 
-    <para>Now remove the <envar>TCLPATH</envar> variable:</para>
+    <para os="k">Now remove the <envar>TCLPATH</envar> variable:</para>
 
-<screen><userinput>unset TCLPATH</userinput></screen>
+<screen os="l"><userinput>unset TCLPATH</userinput></screen>
 
-    <para>The source directories of both Tcl and Expect can now
+    <para os="m">The source directories of both Tcl and Expect can now
     be removed.</para>
 
   </sect2>

Modified: branches/cross-lfs/BOOK/temp-tools/common/tcl.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/common/tcl.xml	2005-08-26 20:08:33 UTC (rev 6758)
+++ branches/cross-lfs/BOOK/temp-tools/common/tcl.xml	2005-08-27 09:49:04 UTC (rev 6759)
@@ -42,10 +42,10 @@
 
   </sect2>
 
-  <sect2 id="install-tcl" role="installation">
+  <sect2 role="installation">
     <title>Installation of Tcl</title>
 
-    <para>This package and the next two (Expect and DejaGNU) are installed
+    <para os="a">This package and the next two (Expect and DejaGNU) are installed
     to support running the test suites for GCC and Binutils. Installing
     three packages for testing purposes may seem excessive, but it is very
     reassuring, if not essential, to know that the most important tools are
@@ -53,16 +53,16 @@
     (they are not mandatory), these packages are required to run the test
     suites in <xref linkend="chapter-building-system"/>.</para>
 
-    <para>Prepare Tcl for compilation:</para>
+    <para os="b">Prepare Tcl for compilation:</para>
 
 <screen><userinput>cd unix
 ./configure --prefix=/tools</userinput></screen>
 
-    <para>Build the package:</para>
+    <para os="c">Build the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>To test the results, issue: <userinput>TZ=UTC make
+    <para os="e">To test the results, issue: <userinput>TZ=UTC make
     test</userinput>. The Tcl test suite is known to experience failures
     under certain host conditions that are not fully understood.
     Therefore, test suite failures here are not surprising, and are not
@@ -73,25 +73,25 @@
     Details on the <envar>TZ</envar> environment variable are provided in
     <xref linkend="chapter-bootscripts"/>.</para>
 
-    <para>Install the package:</para>
+    <para os="f">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
 
-    <warning>
+    <warning os="h">
       <para><emphasis>Do not</emphasis> remove the <filename
       class="directory">tcl&tcl-version;</filename> source directory yet,
       as the next package will need its internal headers.</para>
     </warning>
 
-    <para>Set a variable containing the full path of the current directory.
+    <para os="i">Set a variable containing the full path of the current directory.
     The next package, Expect, will use this variable to find Tcl's headers.</para>
 
-<screen><userinput>cd ..
+<screen os="j"><userinput>cd ..
 export TCLPATH=`pwd`</userinput></screen>
 
-    <para>Now make a necessary symbolic link:</para>
+    <para os="k">Now make a necessary symbolic link:</para>
 
-<screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
+<screen os="l"><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
 
   </sect2>
 

Modified: branches/cross-lfs/BOOK/temp-tools/multilib/expect-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/multilib/expect-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
+++ branches/cross-lfs/BOOK/temp-tools/multilib/expect-64bit.xml	2005-08-27 09:49:04 UTC (rev 6759)
@@ -44,81 +44,64 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/expect.xml"
-    xpointer="xpointer(id('install-expect')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/expect.xml"
-    xpointer="xpointer(id('install-expect')/screen[1])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Now prepare Expect for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
    --with-tcl=/tools/lib64 --with-tclinclude=$TCLPATH \
    --libdir=/tools/lib64 --with-x=no</userinput></screen>
 
-    <para>Build the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/expect.xml"
-    xpointer="xpointer(id('install-expect')/para[4])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>make SCRIPTS="" install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <para>Now remove the <envar>TCLPATH</envar> variable:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>unset TCLPATH</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>The source directories of both Tcl and Expect can now
-    be removed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-  </sect2>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
-  <sect2 id="contents-expect" role="content">
-    <title>Contents of Expect</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
 
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>expect</seg>
-        <seg>libexpect-5.42.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="expect">
-        <term><command>expect</command></term>
-        <listitem>
-          <para>Communicates with other interactive programs according
-          to a script</para>
-          <indexterm zone="ch-temp-tools-expect expect">
-            <primary sortas="b-expect">expect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpect">
-        <term><filename class="libraryfile">libexpect-5.42.a</filename></term>
-        <listitem>
-          <para>Contains functions that allow Expect to be used as a Tcl
-          extension or to be used directly from C or C++ (without Tcl)</para>
-          <indexterm zone="ch-temp-tools-expect libexpect">
-            <primary sortas="c-libexpect-5.42">libexpect-5.42</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
   </sect2>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(id('contents-expect'))"/>
+
 </sect1>

Modified: branches/cross-lfs/BOOK/temp-tools/multilib/tcl-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-08-26 20:08:33 UTC (rev 6758)
+++ branches/cross-lfs/BOOK/temp-tools/multilib/tcl-64bit.xml	2005-08-27 09:49:04 UTC (rev 6759)
@@ -44,93 +44,60 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(id('install-tcl')/para[1])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<para>Prepare Tcl for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen><userinput>cd unix
 sed -i 's@\$(prefix)/lib@\$(prefix)/lib64 at g' Makefile.in
 CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
 
-    <para>Build the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(id('install-tcl')/para[4])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(id('install-tcl')/warning[1])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(id('install-tcl')/para[6])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>cd ..
-export TCLPATH=`pwd`</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
-    <para>Now make a necessary symbolic link:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
   </sect2>
 
-  <sect2 id="contents-tcl" role="content">
-    <title>Contents of Tcl</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/tcl.xml"
+  xpointer="xpointer(id('contents-tcl'))"/>
 
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>tclsh (link to tclsh8.4) and tclsh8.4</seg>
-        <seg>libtcl8.4.so</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tclsh8.4">
-        <term><command>tclsh8.4</command></term>
-        <listitem>
-          <para>The Tcl command shell</para>
-          <indexterm zone="ch-temp-tools-tcl tclsh8.4">
-            <primary sortas="b-tclsh8.4">tclsh8.4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh">
-        <term><command>tclsh</command></term>
-        <listitem>
-          <para>A link to tclsh8.4</para>
-          <indexterm zone="ch-temp-tools-tcl tclsh">
-            <primary sortas="b-tclsh">tclsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtcl8.4.so">
-        <term><filename class="libraryfile">libtcl8.4.so</filename></term>
-        <listitem>
-          <para>The Tcl library</para>
-          <indexterm zone="ch-temp-tools-tcl libtcl8.4.so">
-            <primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
 </sect1>




More information about the lfs-book mailing list