Move tcl, expect, and dejagnu to Chapter 8

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11981 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 35 insertions, 3 deletions

diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 6538959bc..782514a51 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -694,6 +694,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Tcl Documentation (&tcl-version;) - <token>&tcl-docs-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&tcl-docs-url;"/></para>
+        <para>MD5 sum: <literal>&tcl-docs-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&texinfo-home;"/></para>
diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml
index 54136fc3e..aba235220 100644
--- a/chapter07/chapter07.xml
+++ b/chapter07/chapter07.xml
@@ -24,9 +24,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+-->
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
 
 </chapter>
diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index 2e2bc799e..cd8173536 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -14,6 +14,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-pages.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
diff --git a/chapter07/dejagnu.xml b/chapter08/dejagnu.xml
index da6a44aa9..da6a44aa9 100644
--- a/chapter07/dejagnu.xml
+++ b/chapter08/dejagnu.xml
diff --git a/chapter07/expect.xml b/chapter08/expect.xml
index e73676857..da374bd9d 100644
--- a/chapter07/expect.xml
+++ b/chapter08/expect.xml
@@ -82,6 +82,10 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install
diff --git a/chapter07/tcl.xml b/chapter08/tcl.xml
index 39219b06b..1df22b81c 100644
--- a/chapter07/tcl.xml
+++ b/chapter08/tcl.xml
@@ -49,11 +49,15 @@
     packages.  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 working properly. These packages are required
-    to run the test suites in <xref linkend="chapter-building-system"/>.</para>
+    to run the test suites in this chapter.</para>
 
-    <para>Note that the Tcl package used here is a minimal version needed
+<!--    <para>Note that the Tcl package used here is a minimal version needed
     to run the LFS tests.  For the full package, see the  
-    <ulink url='&blfs-book;general/tcl.html'>BLFS Tcl procedures</ulink>.</para>
+    <ulink url='&blfs-book;general/tcl.html'>BLFS Tcl procedures</ulink>.</para>-->
+
+    <para>First, unpack the documentation by issuing the following command:</para>
+
+<screen><userinput remap="pre">tar -xf ../tcl8.6.10-html.tar.gz --strip-components=1</userinput></screen>
 
     <para>Prepare Tcl for compilation:</para>
 
@@ -106,6 +110,10 @@ unset SRCDIR</userinput></screen>
     This is not mandatory for the remainder of LFS, but may be needed in case a
     package built later uses Tcl.</para>
 
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/packages.ent b/packages.ent
index f2378da41..82afae90d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -678,6 +678,9 @@
 <!ENTITY tcl-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz">
 <!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc">
 <!ENTITY tcl-home "http://tcl.sourceforge.net/">
+<!ENTITY tcl-docs-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-html.tar.gz">
+<!ENTITY tcl-docs-md5 "a012711241ba3a5bd4a04e833001d489">
+<!ENTITY tcl-docs-size "1,171 KB">
 <!ENTITY tcl-tmp-du "76 MB">
 <!ENTITY tcl-tmp-sbu "0.9 SBU">