--- MITgcm/verification/testreport	2010/12/14 18:45:52	1.150
+++ MITgcm/verification/testreport	2010/12/15 17:46:30	1.151
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.150 2010/12/14 18:45:52 jmc Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.151 2010/12/15 17:46:30 jmc Exp $
 #  $Name:  $
 #
 
@@ -1392,19 +1392,16 @@
 	    mkOpt=`grep '^# OPTFILE=' $dir/$builddir/Makefile 2>/dev/null | head -1 | sed 's/^# //'`
 	    echo "from '$dir/$builddir/Makefile', extract:" > $DRESULTS/genmake_state
 	    sed -n '/^# executed by:/,+1 p' $dir/$builddir/Makefile >> $DRESULTS/genmake_state
-	    echo $mkOpt >> $DRESULTS/genmake_state
+	    echo " $mkOpt" >> $DRESULTS/genmake_state
 	    gmkLog=$dir/$builddir/genmake.log
 	    grep '^Get compiler version using:' $gmkLog > /dev/null 2>&1
 	    RETVAL=$?
 	    if test "x$RETVAL" = x0 ; then
 		echo "from '$gmkLog', extract compiler version:" >> $DRESULTS/genmake_state
-		sed -n '/Get compiler version/,/--- compiler version/p' $gmkLog | \
-		       grep -v '^... compiler version ' > tr_vers.tmp_log
-		grep -i 'version ' tr_vers.tmp_log >> $DRESULTS/genmake_state
-		RETVAL=$?
-		if test "x$RETVAL" != x0 ; then
-		   cat tr_vers.tmp_log >> $DRESULTS/genmake_state
-		fi
+		sed -n '/Get compiler version/,/<-- compiler version/p' $gmkLog \
+		       | grep -v '^... compiler version ' > tr_vers.tmp_log
+		sed -n '1,/^$/p' tr_vers.tmp_log | sed '/^$/d' | sed 's/^./ &/' \
+			>> $DRESULTS/genmake_state
 		rm -f tr_vers.tmp_log
 	    fi
 	fi