--- MITgcm/tools/genmake2	2004/11/13 03:23:28	1.111
+++ MITgcm/tools/genmake2	2004/12/26 16:38:20	1.113
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.111 2004/11/13 03:23:28 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.113 2004/12/26 16:38:20 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -718,10 +718,18 @@
 
 
 check_netcdf_libs()  {
+    if test ! "x$SKIP_NETCDF_CHECK" = x ; then
+	return
+    fi
     echo "" > genmake_tnc.log
     cat <<EOF > genmake_tnc.for
       program fgennc
 #include "netcdf.inc"
+EOF
+    if test ! "x$MPI" = x ; then
+	echo '#include "mpif.h"' >> genmake_tnc.for
+    fi
+    cat <<EOF >> genmake_tnc.for
       integer iret, ncid, xid
       iret = nf_create('genmake_tnc.nc', NF_CLOBBER, ncid)
       IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret)
@@ -1101,7 +1109,7 @@
 
 #  Find the MITgcm ${ROOTDIR}
 if test "x${ROOTDIR}" = x ; then
-    tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
+    tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'`
     if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
 	ROOTDIR=".."
     else
@@ -1388,7 +1396,7 @@
 fi
 
 if test "x${EXEDIR}" = x ; then
-    tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'`
+    tmp=`echo $PWD | sed -e 's/\// /g' | $AWK '{print $NR}'`
     if test "x$tmp" = "xbin" -a -d ../exe -a $ROOTDIR = .. ; then
 	EXEDIR=../exe
     else