Make the new book

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11831 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 14 insertions, 42 deletions

diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index a2cc67d0e..20b227ea5 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -48,34 +48,29 @@
   <sect2 role="installation">
     <title>Installation of Expect</title>
 
-    <para>First, force Expect's configure script to use <filename>/bin/stty</filename>
-    instead of a <filename>/usr/local/bin/stty</filename> it may find on the host system.
-    This will ensure that our test suite tools remain sane for the final builds of our
-    toolchain:</para>
+    <para>Prepare Expect for compilation:</para>
 
-<screen><userinput remap="pre">cp -v configure{,.orig}
-sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
-
-    <para>Now prepare Expect for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/tools       \
-            --with-tcl=/tools/lib \
-            --with-tclinclude=/tools/include</userinput></screen>
+<screen><userinput remap="configure">
+./configure --prefix=/usr           \
+            --with-tcl=/usr/lib     \
+            --enable-shared         \
+            --mandir=/usr/share/man \
+            --with-tclinclude=/usr/include</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
-        <term><parameter>--with-tcl=/tools/lib</parameter></term>
+        <term><parameter>--with-tcl=/usr/lib</parameter></term>
         <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary tools location instead of possibly
-          locating an existing one on the host system.</para>
+          <para>This parameter is needed to tell the
+          <command>configure</command> where the
+          <command>tclConfig.sh</command> is located.</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
+        <term><parameter>--with-tclinclude=/usr/include</parameter></term>
         <listitem>
           <para>This explicitly tells Expect where to find Tcl's internal
           headers. Using this option avoids conditions where
@@ -90,33 +85,10 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>Compilation is now complete. As discussed earlier, running the test
-    suite is not mandatory for the temporary tools here in this chapter. To run
-    the Expect test suite anyway, issue the following command:</para>
-
-<screen><userinput remap="test">make test</userinput></screen>
-
-    <para>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>
 
-<screen><userinput remap="install">make SCRIPTS="" install</userinput></screen>
-
-    <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>
+<screen><userinput remap="install">make install
+ln -svf expect&expect-version;/libexpect&expect-version;.so /usr/lib</userinput></screen>
 
   </sect2>