--- MITgcm/tools/genmake2	2009/09/22 04:36:30	1.197
+++ MITgcm/tools/genmake2	2009/11/30 21:50:35	1.200
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.197 2009/09/22 04:36:30 utke Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.200 2009/11/30 21:50:35 jmc Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -1405,7 +1405,7 @@
 #  Find the MITgcm ${THISVER}
 version_file="${ROOTDIR}/doc/tag-index"
 if test -f $version_file ; then
-    THISVER=`grep '^checkpoint' $version_file | head -1`
+    THISVER=`$AWK '/^checkpoint/{print $1; exit}' $version_file`
 #-  remove ./BUILD_INFO.h file if older than version_file
     if test -f ./BUILD_INFO.h -a ./BUILD_INFO.h -ot $version_file ; then
 	echo "  remove ./BUILD_INFO.h (older than ${version_file})"
@@ -2783,7 +2783,7 @@
 	-rm -f ad_config.template
 	@make \$(F77_PP_SRC_FILES)
 	@make \$(FLOFILES)
-	cat \$(FLOFILES) \$(AD_FILES) > ad_input_code.$FS
+	cat \$(FLOFILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ad_input_code.$FS
 
 ad_taf_output.$FS: ad_input_code.$FS
 	\$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
@@ -3081,7 +3081,7 @@
 	# this step also creates the file postProcess.make but we cannot 
 	# name it as the target or else make will try to remake it for 
 	# the include directive above for any rule, e.g. make clean
-	./postProcess.py --progress --timing -m r -i ../OAD_support/ad_inline.f --width 4 \$<
+	./postProcess.py --progress --timing --outputFormat=fixed -m r -i ../OAD_support/ad_inline.f --width 4 \$<
 
 # setup some links
 %.xsd: