Fix several contrib makefiles that failed in VPATH builds, particularly

when not using gcc (which has slightly nonstandard inclusion rules).

diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 89dcb45..331b4c9 100644 (file)
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.14 2005/09/27 17:13:00 tgl Exp $
+# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.15 2005/10/18 01:30:48 tgl Exp $
 
 MODULE_big = cube
 OBJS= cube.o cubeparse.o
@@ -9,6 +9,8 @@ REGRESS = cube
 
 EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
 
+PG_CPPFLAGS = -I.
+
 SHLIB_LINK += $(filter -lm, $(LIBS))
 
 ifdef USE_PGXS

diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index 564ffe6..face0c4 100644 (file)
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.13 2005/09/27 17:13:09 tgl Exp $
+# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.14 2005/10/18 01:30:48 tgl Exp $
 
 MODULE_big = seg
 OBJS = seg.o segparse.o
@@ -8,6 +8,8 @@ REGRESS = seg
 
 EXTRA_CLEAN = segparse.c segparse.h segscan.c y.tab.c y.tab.h
 
+PG_CPPFLAGS = -I.
+
 ifdef USE_PGXS
 PGXS := $(shell pg_config --pgxs)
 include $(PGXS)

diff --git a/contrib/tsearch2/ispell/Makefile b/contrib/tsearch2/ispell/Makefile
index 562a2b3..341f7f4 100644 (file)
--- a/contrib/tsearch2/ispell/Makefile
+++ b/contrib/tsearch2/ispell/Makefile
@@ -1,14 +1,16 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.8 2005/09/27 17:13:11 tgl Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/ispell/Makefile,v 1.9 2005/10/18 01:30:48 tgl Exp $
 
-PG_CPPFLAGS = -I$(srcdir)/.. 
 SUBOBJS = spell.o regis.o 
+
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
 
+PG_CPPFLAGS = -I$(srcdir)/.. 
+
 ifdef USE_PGXS
 PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
-subdir = contrib/tsearch2
+subdir = contrib/tsearch2/ispell
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk

diff --git a/contrib/tsearch2/snowball/Makefile b/contrib/tsearch2/snowball/Makefile
index b549663..bb107a1 100644 (file)
--- a/contrib/tsearch2/snowball/Makefile
+++ b/contrib/tsearch2/snowball/Makefile
@@ -1,15 +1,16 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.7 2005/09/27 17:13:12 tgl Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/snowball/Makefile,v 1.8 2005/10/18 01:30:48 tgl Exp $
 
-
-PG_CPPFLAGS = -I$(srcdir)/..
 SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
+
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
 
+PG_CPPFLAGS = -I$(srcdir)/..
+
 ifdef USE_PGXS
 PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
-subdir = contrib/tsearch2
+subdir = contrib/tsearch2/snowball
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk

diff --git a/contrib/tsearch2/wordparser/Makefile b/contrib/tsearch2/wordparser/Makefile
index 141e662..0070970 100644 (file)
--- a/contrib/tsearch2/wordparser/Makefile
+++ b/contrib/tsearch2/wordparser/Makefile
@@ -1,15 +1,16 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.7 2005/09/27 17:13:12 tgl Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/wordparser/Makefile,v 1.8 2005/10/18 01:30:49 tgl Exp $
 
-
-PG_CPPFLAGS = -I$(srcdir)/..
 SUBOBJS =  parser.o deflex.o
+
 EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
 
+PG_CPPFLAGS = -I$(srcdir)/..
+
 ifdef USE_PGXS
 PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
-subdir = contrib/tsearch2
+subdir = contrib/tsearch2/wordparser
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk