From a0f4b12e49fd4f6d729ff688a812f30016dab56d Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sat, 16 Sep 2006 19:05:45 +0000
Subject: [PATCH] Fixed ICA/farce runs, I hope.

---
 common/func_compare.sh | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/common/func_compare.sh b/common/func_compare.sh
index a00aba7..936472d 100644
--- a/common/func_compare.sh
+++ b/common/func_compare.sh
@@ -26,13 +26,27 @@ wrt_system_build() {               #
   local PREV_IT=$2
 
   if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "chroot" ]] ; then
-    final_system_Makefiles $RUN
+    chroot_final_system_Makefiles $RUN
   elif [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
-    bm_final_system_Makefiles $RUN
+    boot_final_system_Makefiles $RUN
   else
     chapter6_Makefiles $RUN
   fi
 
+  if [[ "$PROGNAME" = "clfs" ]] ; then
+    basicsystem="$basicsystem $PREV_IT $system_build"
+  else
+    chapter6="$chapter6 $PREV_IT $system_build"
+  fi
+
+  if [[ "$RUN" = "$ITERATIONS" ]] ; then
+    if [[ "$PROGNAME" = "clfs" ]] ; then
+      basicsystem="$basicsystem iteration-$RUN"
+    else
+      chapter6="$chapter6 iteration-$RUN"
+    fi
+  fi
+
   echo -e "\nsystem_build_$RUN: $PREV_IT $system_build" >> $MKFILE.tmp
 }
 
@@ -44,15 +58,10 @@ wrt_compare_work() {               #
   local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt /proc \
 /sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
 
-  if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
-    local    ROOT_DIR=/
-    local DEST_TOPDIR=/${SCRIPT_ROOT}
-    local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
-    local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
-  else
-    local    ROOT_DIR=$BUILDDIR
-    local DEST_TOPDIR=$BUILDDIR/${SCRIPT_ROOT}
-  fi
+  local    ROOT_DIR=/
+  local DEST_TOPDIR=/${SCRIPT_ROOT}
+  local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
+  local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
 
   if [[ "$RUN_ICA" = "y" ]] ; then
     local DEST_ICA=$DEST_TOPDIR/ICA && \