Changeset 7bbd436

Timestamp:

10/03/2005 06:28:57 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

0.2, 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

816f3f43

Parents:

fc8de49

Message:

Fixed the retainig of Binutils and TCL sources directories.
Removed some now uneeded "if" test.

File:

• jhalfs (modified) (5 diffs)

jhalfs

@@ -372 +372 @@
     # Everything else, add a true statment so we don't confuse make
     else
-        echo -e "\ttrue" >> $MKFILE.tmp
+      echo -e "\ttrue" >> $MKFILE.tmp
     fi
 
@@ -396 +396 @@
       fi
     fi
+
+    # Remove the Binutils pass 1 sources after a successful Adjusting phase.
+    if [ "$i" = "031-adjusting" ] ; then
+      echo -e "\t@rm -r \`cat sources-dir\` && \\" >> $MKFILE.tmp
+      echo -e "\trm -r \$(LFS)\$(SRC)/binutils-build && \\" >> $MKFILE.tmp
+      echo -e "\trm sources-dir; \\" >> $MKFILE.tmp
+    fi
+
+    # Remove the TCL sources after a successful Expect build.
+    if [ "$i" = "033-expect" ] ; then
+      echo -e "\t@rm -r \`cat sources-dir\` && \\" >> $MKFILE.tmp
+      echo -e "\trm sources-dir; \\" >> $MKFILE.tmp
+    fi
+
+    # Include a touch of the target name so make can check
+    # if it's already been made.
+    echo -e "\t@touch \$@" >> $MKFILE.tmp
+
+    # The next two "if" must be after the touch to can check if the sources
+    # directories should be retained or deleted.
     if [ "$i" = "027-binutils-pass1" -o "$i" = "036-binutils-pass2" ] ; then
       echo -e "\t@if [ ! -e \$@ ] ; then \\" >> $MKFILE.tmp
@@ -409 +429 @@
       echo -e "\tfi;" >> $MKFILE.tmp
     fi
-
-    # Remove the Binutils pass 1 sources after a successful Adjusting phase.
-    if [ "$i" = "031-adjusting" ] ; then
-      echo -e "\t@if [ -e \$@ ] ; then \\" >> $MKFILE.tmp
-      echo -e "\t\trm -r \`cat sources-dir\` && \\" >> $MKFILE.tmp
-      echo -e "\t\trm -r \$(LFS)\$(SRC)/binutils-build && \\" >> $MKFILE.tmp
-      echo -e "\t\trm sources-dir; \\" >> $MKFILE.tmp
-      echo -e "\tfi;" >> $MKFILE.tmp
-    fi
-
-    # Remove the TCL sources after a successful Expect build.
-    if [ "$i" = "033-expect" ] ; then
-      echo -e "\t@if [ -e \$@ ] ; then \\" >> $MKFILE.tmp
-      echo -e "\t\trm -r \`cat sources-dir\` && \\" >> $MKFILE.tmp
-      echo -e "\t\trm sources-dir; \\" >> $MKFILE.tmp
-      echo -e "\tfi;" >> $MKFILE.tmp
-    fi
-
-    # Include a touch of the target name so make can check
-    # if it's already been made.
-    echo -e "\t@touch \$@" >> $MKFILE.tmp
 
     # Keep the script file name for Makefile dependencies.
@@ -506 +505 @@
     # Remove the Binutils pass 2 sources after a successful Re-Adjusting phase.
     if [ "$i" = "067-readjusting" ] ; then
-      echo -e "\t@if [ -e \$@ ] ; then \\" >> $MKFILE.tmp
-      echo -e "\t\trm -r \`cat sources-dir\` && \\" >> $MKFILE.tmp
-      echo -e "\t\trm -r \$(SRC)/binutils-build && \\" >> $MKFILE.tmp
-      echo -e "\t\trm sources-dir; \\" >> $MKFILE.tmp
-      echo -e "\tfi;" >> $MKFILE.tmp
+      echo -e "\t@rm -r \`cat sources-dir\` && \\" >> $MKFILE.tmp
+      echo -e "\trm -r \$(SRC)/binutils-build && \\" >> $MKFILE.tmp
+      echo -e "\trm sources-dir; \\" >> $MKFILE.tmp
     fi
 
@@ -534 +531 @@
   for file in chapter06/*chroot* ; do
     chroot=`cat $file | sed -e '/#!\/bin\/sh/d' -e 's@ \\\@ @g' | tr -d '\n' | sed \
-        -e 's/  */ /g' -e 's|\\$|&&|g' -e 's|$| -c|'`
+      -e 's/  */ /g' -e 's|\\$|&&|g' -e 's|$| -c|'`
     echo -e "CHROOT$i= $chroot\n" >> $MKFILE
     i=`expr $i + 1`