--- MITgcm/tools/genmake2	2003/10/02 18:26:44	1.11.2.8
+++ MITgcm/tools/genmake2	2003/10/09 04:19:20	1.12
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.11.2.8 2003/10/02 18:26:44 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.12 2003/10/09 04:19:20 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -49,7 +49,7 @@
 	cat ./p1.tmp | awk '(NF>2 && $2==":"){ print $0 }' > ./p2.tmp
 	matched=0
 	for i in $PACKAGES ; do
-	    line=`grep $i ./p2.tmp`
+	    line=`grep "^ *$i" ./p2.tmp`
 	    RETVAL=$?
 	    if test "x$RETVAL" = x0 ; then
 		matched=1
@@ -72,7 +72,7 @@
 
     tmp1=`uname`"_"`uname -m`
     tmp2=`echo $tmp1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    PLATFORM=`echo $tmp2 | sed -e 's/i[3-6]86/ia32/'`
+    PLATFORM=`echo $tmp2 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'`
     OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`
     echo "  The platform appears to be:  $PLATFORM"
 #     if test "x$OFLIST" = x ; then
@@ -239,6 +239,8 @@
     echo "      -disable=NAME | --disable=NAME"
     echo "    -enable NAME | --enable NAME"
     echo "      -enable=NAME | --enable=NAME"
+    echo "    -standarddirs NAME | --standarddirs NAME"
+    echo "      -standarddirs=NAME | --standarddirs=NAME"
     echo "    -noopt NAME | --noopt NAME"
     echo "      -noopt=NAME | --noopt=NAME"
 #    echo "    -cpp NAME | --cpp NAME"
@@ -313,6 +315,7 @@
 TOOLSDIR=
 SOURCEDIRS=
 INCLUDEDIRS=
+STANDARDDIRS=
 
 PWD=`pwd`
 MAKE=make
@@ -323,23 +326,34 @@
 EXECUTABLE=
 EXEHOOK=
 EXEDIR=
+PACKAGES_CONF=
+IEEE=
+if test "x$MITGCM_IEEE" != x ; then
+    IEEE=$MITGCM_IEEE
+fi
 
 #  The following state can be set directly by command-line switches
 gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE NOOPT"
-gm_s2="FC IEEE MPI JAM DUMPSTATE"
+gm_s2="FC IEEE MPI JAM DUMPSTATE STANDARDDIRS"
 
 #  The following state is not directly set by command-line switches
 gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM "
 gm_s4="CFLAGS KFLAGS1 KFLAGS2 LIBS KPPFILES NOOPTFILES NOOPTFLAGS"
 gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOSTNAME THISDATE MACHINE"
-gm_s6="EXECUTABLE EXEHOOK EXEDIR"
+gm_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF"
 
 gm_state="COMMANDL $gm_s1 $gm_s2 $gm_s3 $gm_s4 $gm_s5 $gm_s6"
 
 
 echo
 echo "===  Processing options files and arguments  ==="
-gm_local="./gm_local"
+gm_local="genmake_local"
+for i in . $MODS ; do
+    if test -r $i/$gm_local ; then
+	source $i/$gm_local
+	break
+    fi
+done
 echo -n "  getting local config information:  "
 if test -e $gm_local ; then
     echo "using $gm_local"
@@ -431,6 +445,11 @@
 	-enable=* | --enable=*)
 	    ENABLE=$ac_optarg ;;
 	
+	-standarddirs | --standarddirs)
+	    ac_prev=STANDARDDIRS ;;
+	-standarddirs=* | --standarddirs=*)
+	    STANDARDDIRS=$ac_optarg ;;
+
 	-noopt | --noopt)
 	    ac_prev=NOOPT ;;
 	-noopt=* | --noopt=*)
@@ -447,14 +466,14 @@
 	    FC=$ac_optarg ;;
 	
 	-ieee | --ieee)
-	    IEEE=1 ;;
+	    IEEE=true ;;
 	-noieee | --noieee)
-	    IEEE=0 ;;
+	    IEEE= ;;
 	
 	-mpi | --mpi)
-	    MPI=1 ;;
+	    MPI=true ;;
 	-nompi | --nompi)
-	    MPI=0 ;;
+	    MPI= ;;
 	
 	-jam | --jam)
 	    JAM=1 ;;
@@ -478,6 +497,18 @@
     
 done
 
+if test -f ./.genmakerc ; then
+    echo
+    echo "WARNING: genmake2 has detected a copy of the old-style \"./.genmakerc\""
+    echo "  file.  This file format is no longer supported.  Please see:"
+    echo 
+    echo "    http://mitgcm.org/devel_HOWTO/"
+    echo
+    echo "  for directions on how to setup and use the new \"genmake2\" input"
+    echo "  files and send an email to MITgcm-support@mitgcm.org if you want help."
+    echo 
+fi
+
 if test "x${ROOTDIR}" = x ; then
     if test "${PWD##/*/}" = "bin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
 	ROOTDIR=".."
@@ -524,7 +555,7 @@
 	    exit 1
 	fi
 	if test "x$DUMPSTATE" != xf ; then
-	    cp -f $OPTFILE "gm_optfile"
+	    cp -f $OPTFILE "genmake_optfile"
 	fi
     else
 	echo "Error: can't read OPTFILE=\"$OPTFILE\""
@@ -540,7 +571,7 @@
 Error: no Fortran compiler: please specify using one of the following:
   1) within the options file ("FC=...") as specified by "-of=OPTFILE"
   2) the "-fc=XXX" command-line option
-  3) the "./gm_local" file
+  3) the "./genmake_local" file
 EOF
     exit 1
 fi
@@ -558,7 +589,7 @@
 Error: C pre-processor "$CPP" failed the test case: please specify using:
 
   1) within the options file ("CPP=...") as specified by "-of=OPTFILE"
-  2) the "./gm_local" file
+  2) the "./genmake_local" file
 
 EOF
     exit 1
@@ -923,7 +954,9 @@
 
 echo "  Adding STANDARDDIRS"
 BUILDDIR=${BUILDDIR:-.}
-STANDARDDIRS=${STANDARDDIRS:-"eesupp model"}
+if test "x$STANDARDDIRS" = x ; then
+    STANDARDDIRS="eesupp model"
+fi
 for d in $STANDARDDIRS ; do
     adr="$ROOTDIR/$d/src"
     if test ! -d $adr ; then
@@ -1153,7 +1186,7 @@
 Clean:
 	@make clean
 	@make cleanlinks
-	-rm -f Makefile.bak gm_state gm_optfile make.log
+	-rm -f Makefile.bak genmake_state genmake_optfile make.log
 CLEAN:
 	@make Clean
 	-find \$(EXEDIR) -name "*.meta" -exec rm {} \;
@@ -1223,10 +1256,10 @@
 
 #  Write the "state" for future records
 if test "x$DUMPSTATE" != xf ; then
-    echo -n "" > gm_state
+    echo -n "" > genmake_state
     for i in $gm_state ; do
 	t1="t2=\$$i"
 	eval $t1
-	echo "$i='$t2'" >> gm_state
+	echo "$i='$t2'" >> genmake_state
     done
 fi