 +      echo -e "export PACO_TMPFILE=$PACO_TMPFILE" >> $JHALFSDIR/pacovars
 +    fi
 +  fi
-   if [[ -n "$FILES" ]]; then
-     # pushd/popd necessary to deal with mulitiple files
-     pushd $PACKAGE_DIR 1> /dev/null
+   if [[ "$COMPARE" != "0" ]] ; then
+     mkdir -p $JHALFSDIR/extras
+     cp extras/* $JHALFSDIR/extras

+(
+cat << EOF
+	@if [ -e \$(MOUNT_PT)$PACO_TMPFILE ]; then \\
+		\$(CHROOT1) 'paco -lp $PACKAGE < $PACO_TMPFILE' && \\
+		rm -f \$(MOUNT_PT)$PACO_TMPFILE; \\
+	fi;
+EOF

        ;;
     esac
     #
@@ -444,6 +456,14 @@
     PREV=${this_script}${N}
     # Set system_build envar for iteration targets
     system_build=$chapter6
+
+    # Reinstall paco after the toolchain has been readjusted.
+    case "${this_script}" in
