From 934947950f9e15559fb9c0880867ad619763668f Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Fri, 16 Dec 2005 16:42:49 +0000
Subject: [PATCH] No need to retain TCL's directory anymore, and a few typo
 fixes.

---
 jhalfs | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/jhalfs b/jhalfs
index 4ddaabd..94d3f07 100755
--- a/jhalfs
+++ b/jhalfs
@@ -322,7 +322,7 @@ get_sources() {
       # Needed for Groff patchlevel patch on UTF-8 branch
       GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | sed -e 's/groff-patchlevel //' -e 's/"//g'`
 
-      # There is some entities that aren't valid package entities.
+      # There are some entities that aren't valid packages.
       if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" ] ; then continue ; fi
 
       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
@@ -420,7 +420,7 @@ chapter5_Makefiles() {
     # Keep the script file name
     i=`basename $file`
 
-    # If no testsuites will be run, then TCL, Expect and DejaGNU isn't needed
+    # If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed
     if [ "$TOOLCHAINTEST" = "0" ]; then
       if [[ `_IS_ $i tcl` ]] || [[ `_IS_ $i expect` ]] || [[ `_IS_ $i dejagnu` ]] ; then
         continue
@@ -479,8 +479,8 @@ EOF
 
     fi
 
-    # Dump the path to the Binutils or TCL sources directory.
-    if [[ `_IS_ $i binutils` ]] || [[ `_IS_ $i tcl` ]] ; then
+    # Dump the path to the Binutils sources directory.
+    if [[ `_IS_ $i binutils` ]] ; then
 (
     cat << EOF
 	echo "\$(LFS)\$(SRC)/\$\$ROOT" > sources-dir
@@ -494,15 +494,6 @@ EOF
 	@echo "PKGDIR=\$(LFS)\$(SRC)/binutils-build" > envars && \\
 	echo "export PKGDIR" >> envars
 EOF
-) >> $MKFILE.tmp
-
-    # For the Expect build we need to set the TCLPATH envar.
-    elif [[ `_IS_ $i expect` ]] ; then
-(
-    cat << EOF
-	echo "TCLPATH=\`cat sources-dir\`" >> envars && \\
-	echo "export TCLPATH" >> envars
-EOF
 ) >> $MKFILE.tmp
 
     # Everything else, add a true statment so we don't confuse make
@@ -525,10 +516,10 @@ EOF
 ) >> $MKFILE.tmp
 
     # Remove the build directory(ies) except if the package build fails
-    # (to can review config.cache, config.log, and like.)
-    # For Binutils and TCL the sources must be retained some time.
+    # (so we can review config.cache, config.log, etc.)
+    # For Binutils the sources must be retained for some time.
     if [ "$vrs" != "" ] ; then
-      if [[ ! `_IS_ $i binutils` ]] && [[ ! `_IS_ $i tcl` ]] ; then
+      if [[ ! `_IS_ $i binutils` ]] ; then
 (
     cat << EOF
 	@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
@@ -552,16 +543,6 @@ EOF
 ) >> $MKFILE.tmp
     fi
 
-    # Remove the TCL sources after a successful Expect build.
-    if [[ `_IS_ $i expect` ]] ; then
-(
-    cat << EOF
-	@rm -r \`cat sources-dir\` && \\
-	rm sources-dir
-EOF
-) >> $MKFILE.tmp
-    fi
-
     # Include a touch of the target name so make can check
     # if it's already been made.
 (