--- MITgcm/tools/genmake2	2003/10/02 14:27:50	1.11.2.5
+++ MITgcm/tools/genmake2	2003/10/02 18:26:44	1.11.2.8
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.11.2.5 2003/10/02 14:27:50 adcroft Exp $
+# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.11.2.8 2003/10/02 18:26:44 edhill Exp $
 #
 # Makefile generator for MITgcm UV codes
 #   created  by cnh 03/98
@@ -833,7 +833,7 @@
 # echo
 
 # Create a list of #define and #undef to enable/disable packages
-PACKAGES_DOT_H=PACKAGES.h
+PACKAGES_DOT_H=PACKAGES_CONFIG.h
 cat <<EOF >$PACKAGES_DOT_H".tmp"
 C=== GENMAKE v2 ===
 C  The following defines have been set by GENMAKE, so please do not
@@ -841,6 +841,9 @@
 C  add or remove packages by re-running genmake with different 
 C  "-enable" and/or "-disable" options.
 
+#ifndef PACKAGES_H
+#define PACKAGES_H
+
 C  Packages disabled by genmake:
 EOF
 #  The following UGLY HACK sets multiple "#undef"s and it needs to go 
@@ -900,6 +903,11 @@
 #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
 
 done
+cat <<EOF >>$PACKAGES_DOT_H".tmp"
+
+#endif /* PACKAGES_H */
+EOF
+
 if test ! -f $PACKAGES_DOT_H ; then
     mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
 else