Fix several contrib makefiles that failed in VPATH builds, particularly

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

5 files changed, 16 insertions, 8 deletions

diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 9caddaee9f..c0cbd06bf1 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -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 3d69ac04b3..56a51e32fa 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -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 5b23fa3396..284ca11736 100644
--- a/contrib/tsearch2/ispell/Makefile
+++ b/contrib/tsearch2/ispell/Makefile
@@ -1,14 +1,16 @@
 # $PostgreSQL$
 
-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 ab9a6db972..8f6ea04bdc 100644
--- a/contrib/tsearch2/snowball/Makefile
+++ b/contrib/tsearch2/snowball/Makefile
@@ -1,15 +1,16 @@
 # $PostgreSQL$
 
-
-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 15d8b177bc..1e570b62b6 100644
--- a/contrib/tsearch2/wordparser/Makefile
+++ b/contrib/tsearch2/wordparser/Makefile
@@ -1,15 +1,16 @@
 # $PostgreSQL$
 
-
-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