--- MITgcm/tools/genmake2	2012/12/04 20:20:29	1.246
+++ MITgcm/tools/genmake2	2013/01/24 19:07:04	1.248
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.246 2012/12/04 20:20:29 jahn Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.248 2013/01/24 19:07:04 jmc Exp $
 # $Name:  $
 #
 # Makefile generator for MITgcm UV codes
@@ -1702,6 +1702,8 @@
 if test ! "x$MPI" = x ; then
       echo "  Turning on MPI cpp macros"
       DEFINES="$DEFINES -DALLOW_USE_MPI"
+#- To compile code older than checkpoint63s (2012/09/05), un-comment the following line:
+#     DEFINES="$DEFINES -DALWAYS_USE_MPI"
 fi
 if test ! "x$OMP" = x ; then
       echo "  Add OMPFLAG and turn on OpenMP cpp macros"
@@ -2767,6 +2769,9 @@
     echo "EMBEDDED_FILES = " >>$MAKEFILE
 fi
 
+# extract default cpp search path so we can pass it to makedepend
+CPPINCLUDES=`cat /dev/null | $CPP -v 2>&1 | awk '/^End of search/{f=0}!/^\#/{if(f){printf " -I%s", $1;}}/^\#include "..." search start/{f=1}'`
+
 cat >>$MAKEFILE <<EOF
 # Unix ln (link)
 LN = ${LN}
@@ -2787,6 +2792,8 @@
 DEFINES = ${DEFINES}
 # Includes for CPP
 INCLUDES = ${INCLUDES}
+# default CPP includes for makedepend
+CPPINCLUDES = ${CPPINCLUDES}
 # Flags for KPP
 KFLAGS1 = ${KFLAGS1}
 KFLAGS2 = ${KFLAGS2}
@@ -2852,7 +2859,7 @@
 
 depend:
 	@\$(MAKE) -f \$(MAKEFILE) links
-	\$(MAKEDEPEND) -f \$(MAKEFILE) -o .$FS \$(DEFINES) \$(INCLUDES) \$(F77_SRC_FILES)
+	\$(MAKEDEPEND) -f \$(MAKEFILE) -o .$FS \$(DEFINES) \$(INCLUDES) \$(CPPINCLUDES) \$(F77_SRC_FILES)
 	\$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
 	-rm -f makedepend.out