--- MITgcm/tools/genmake2	2003/09/23 15:53:02	1.8
+++ MITgcm/tools/genmake2	2003/09/26 18:47:59	1.10
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.8 2003/09/23 15:53:02 edhill Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.10 2003/09/26 18:47:59 adcroft Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -696,9 +696,9 @@
 # done
 # echo
 
-echo "  Setting package-specific CPP flags in CPP_OPTIONS.h:"
+echo "  Searching for CPP_OPTIONS.h (macros and flags for configuring the model):"
 CPP_OPTIONS=
-spaths="$SOURCEDIRS"
+spaths="$MODS ./ $SOURCEDIRS"
 for i in $spaths ; do
     try="$i/CPP_OPTIONS.h"
     #  echo -n "    trying $try : "
@@ -833,7 +833,7 @@
 echo -n 'CSRCFILES = '   > csrclist.inc
 echo -n 'F90SRCFILES = ' > f90srclist.inc
 echo -n 'HEADERFILES = ' > hlist.inc
-alldirs=". $SOURCEDIRS $INCLUDEDIRS"
+alldirs="$SOURCEDIRS $INCLUDEDIRS ."
 for d in $alldirs ; do
     deplist=
     sfiles=`( cd $d; echo *.[h,c,F] )`