Generated header files parse.h and fmgroids.h are now copied into

the src/include tree, so that -I backend is no longer necessary anywhere.
Also, clean up some bit rot in contrib tree.

contrib/string/Makefile

@@ -11,12 +11,7 @@ SRCDIR = $(PGDIR)/src
 
 include $(SRCDIR)/Makefile.global
 
-INCLUDE_OPT =	-I./ \
-		-I$(SRCDIR)/ \
-		-I$(SRCDIR)/include \
-		-I$(SRCDIR)/port/$(PORTNAME)
-
-CFLAGS += $(INCLUDE_OPT) $(CFLAGS_SL)
+CFLAGS += -I. $(CFLAGS_SL)
 
 MODNAME =	string_io
 
@@ -61,7 +56,7 @@ $(SQLDIR):
 		$(CC) $(CFLAGS) -shared -o $@ $<
 
 depend dep:
-		$(CC) -MM $(INCLUDE_OPT) *.c >depend
+		$(CC) -MM $(CFLAGS) *.c >depend
 
 clean:
 		rm -f *~ $(MODULE) $(MODNAME).sql

contrib/string/string_io.c

@@ -22,6 +22,7 @@
 /* define this if you want to see iso-8859 characters */
 #define ISO8859
 
+#undef MIN
 #define MIN(x, y)	((x) < (y) ? (x) : (y))
 #define VALUE(char) ((char) - '0')
 #define DIGIT(val)	((val) + '0')