--- MITgcm/tools/genmake2	2004/10/22 11:46:02	1.109
+++ MITgcm/tools/genmake2	2004/11/13 03:23:28	1.111
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.109 2004/10/22 11:46:02 heimbach Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.111 2004/11/13 03:23:28 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -731,11 +731,22 @@
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
       end
 EOF
-    #echo "$CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f"
-    #echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.f"
-    #echo "$LINK -o genmake_tnc.o $LIBS"
+    echo "Executing:" > genmake_tnc.log
+    echo "  $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f" \
+	> genmake_tnc.log
+    RET_CPP=f
     $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null  \
-	&&  $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1  \
+	&&  RET_CPP=t
+    if test "x$RET_CPP" = xf ; then
+	echo "  WARNING: CPP failed to pre-process the netcdf test." \
+	    > genmake_tnc.log
+	echo "    Please check that \$INCLUDES is properly set." \
+	    > genmake_tnc.log
+    fi
+    echo "Executing:" > genmake_tnc.log
+    echo "  $FC $FFLAGS $FOPTIM -c genmake_tnc.f" > genmake_tnc.log
+    echo "  $LINK -o genmake_tnc.o $LIBS" > genmake_tnc.log
+    $FC $FFLAGS $FOPTIM -c genmake_tnc.f >> genmake_tnc.log 2>&1  \
 	&&  $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1
     RET_COMPILE=$?
 
@@ -791,7 +802,7 @@
 DUMPSTATE=t
 PDEFAULT=
 OPTFILE=
-INCLUDES="-I."
+INCLUDES="-I. $INCLUDES"
 FFLAGS=
 FOPTIM=
 CFLAGS=
@@ -1588,7 +1599,7 @@
 	PACKAGES=`echo $PACKAGES | sed -e 's/mnc//g'`
 	DISABLE="$DISABLE mnc"
     else
-	( cd $ROOTDIR"/pkg/mnc" && $MAKE templates ) > make_mnc.errors 2>&1
+	( cd $ROOTDIR"/pkg/mnc" && $MAKE testclean && $MAKE templates ) > make_mnc.errors 2>&1
 	RETVAL=$?
 	if test "x${RETVAL}" = x0 ; then
 	    rm -f make_mnc.errors