--- MITgcm/tools/genmake2	2004/12/26 16:38:20	1.113
+++ MITgcm/tools/genmake2	2005/01/06 15:32:16	1.116
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.113 2004/12/26 16:38:20 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.116 2005/01/06 15:32:16 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -796,9 +796,9 @@
 LN=
 S64=
 KPP=
-FC=
+#FC=
 #CC=gcc
-CPP=
+#CPP=
 LINK=
 DEFINES=
 PACKAGES=
@@ -842,8 +842,8 @@
 G2ARGS=
 BASH=
 PWD=`pwd`
-MAKE=make
-AWK=awk
+test "x$MAKE" = x  &&  MAKE=make
+test "x$AWK" = x   &&  AWK=awk
 THISHOST=`hostname`
 THISCWD=`pwd`
 THISDATE=`date`
@@ -1722,14 +1722,14 @@
 	    fi
 	done
 	if test "x$has_pack" = xf ; then
-	    undef=`echo "ALLOW_$n" | $AWK '{print toupper($0)}'`
+	    undef=`echo "ALLOW_$n" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
             DISABLED_PACKAGES="$DISABLED_PACKAGES -U$undef"
 	fi
     fi
 done
 ENABLED_PACKAGES=
 for i in $PACKAGES ; do
-    def=`echo "ALLOW_$i" | $AWK '{print toupper($0)}'`
+    def=`echo "ALLOW_$i" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
     ENABLED_PACKAGES="$ENABLED_PACKAGES -D$def"
 #eh3 DEFINES="$DEFINES -D$def"
 
@@ -1856,7 +1856,7 @@
 		  	deplist="$deplist $sf"
 			;;
                 esac
-		extn=`echo $sf | $AWK -F '.' '{print $NF}'`
+		extn=`echo $sf | $AWK -F. '{print $NF}'`
 		case $extn in
 		    F)
 			echo    " \\"  >> srclist.inc