aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorJeremy Huntwork <jhuntwork@linuxfromscratch.org>2005-12-13 18:41:56 +0000
committerJeremy Huntwork <jhuntwork@linuxfromscratch.org>2005-12-13 18:41:56 +0000
commita71ef0810363a3f394108b943bd0be00b506293b (patch)
tree026753e259c32b16f6f16392e4ce4ffcc35b9981 /chapter05
parent646a1845e54213b88c741c0c96d8d693983f8013 (diff)
Install Tcl's internal headers to /tools/include. Thanks Greg Schafer, Dan Nicholson (fixes bug 1670).
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7218 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/expect.xml17
-rw-r--r--chapter05/tcl.xml10
2 files changed, 7 insertions, 20 deletions
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 7ba3c7119..32662380c 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -37,7 +37,7 @@ suite run:</para>
<para>Now prepare Expect for compilation:</para>
<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
- --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
+ --with-tclinclude=/tools/include --with-x=no</userinput></screen>
<para>The meaning of the configure options:</para>
@@ -50,11 +50,10 @@ one on the host system.</para></listitem>
</varlistentry>
<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>
+<term><parameter>--with-tclinclude=/tools/include</parameter></term>
+<listitem><para>This explicitly tells Expect where to find Tcl's internal headers.
+Using this option avoids conditions where <command>configure</command> fails because
+it cannot automatically discover the location of Tcl's headers.</para></listitem>
</varlistentry>
<varlistentry>
@@ -90,12 +89,6 @@ 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>
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index f0f7dd868..3787a3d95 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -66,15 +66,9 @@ Details on the <envar>TZ</envar> environment variable are provided in
<screen><userinput>make install</userinput></screen>
-<warning><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>Install Tcl's headers. The next package, Expect, requires them to build.</para>
-<para>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 ..
-export TCLPATH=`pwd`</userinput></screen>
+<screen><userinput>make install-private-headers</userinput></screen>
<para>Now make a necessary symbolic link:</para>