--- MITgcm/tools/genmake2	2003/12/04 15:00:01	1.52
+++ MITgcm/tools/genmake2	2003/12/06 00:34:29	1.55
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.52 2003/12/04 15:00:01 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.55 2003/12/06 00:34:29 jmc Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -1177,9 +1177,8 @@
 #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
     case $i in 
 	aim_v23)
-	    DEFINES="$DEFINES -DALLOW_AIM"
             ENABLED_PACKAGES="$ENABLED_PACKAGES -DALLOW_AIM"
-	    echo "Warning: ALLOW_AIM is set to enable aim_v23. This is REALLY ugly Jean-Michel :-)"
+	    echo "Warning: ALLOW_AIM is set to enable aim_v23."
 	    ;;
     esac
 #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
@@ -1218,7 +1217,7 @@
 names=`ls -1 "$ROOTDIR/pkg"`
 for i in $spaths ; do
     try="$i/CPP_OPTIONS.h"
-    if test -f $try -a -r $try -a "x$CPP_OPTIONS" == x ; then
+    if test -f $try -a -r $try -a "x$CPP_OPTIONS" = x ; then
 	echo "    found CPP_OPTIONS=\"$try\""
 	CPP_OPTIONS="$try"
         # New safety test: make sure packages are not mentioned in CPP_OPTIONS.h
@@ -1227,7 +1226,7 @@
         done
     fi
     try="$i/CPP_EEOPTIONS.h"
-    if test -f $try -a -r $try -a "x$CPP_EEOPTIONS" == x ; then
+    if test -f $try -a -r $try -a "x$CPP_EEOPTIONS" = x ; then
 	echo "    found CPP_EEOPTIONS=\"$try\""
         # New safety test: make sure MPI is not determined by CPP_EEOPTIONS.h
 #**** not yet enabled ****
@@ -1353,6 +1352,8 @@
 EXE_SVD=$EXECUTABLE"_svd"
 
 cat >>$MAKEFILE <<EOF
+#
+# OPTFILE="$OPTFILE"
 # 
 # BUILDDIR     : Directory where object files are written
 # SOURCEDIRS   : Directories containing the source (.F) files