Fix to build correctly outside source tree.

diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile
index 7dd1e1b0810e695a2f1b4268f81300bf56ab976e..6df6bcf3ba53b89491a741d952f4b6266e71a222 100644 (file)
--- a/contrib/tsearch2/Makefile
+++ b/contrib/tsearch2/Makefile
@@ -3,7 +3,7 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I. -I./snowball -I./ispell -I./wordparser $(CPPFLAGS)
+override CPPFLAGS := -I$(srcdir) -I$(srcdir)/snowball -I$(srcdir)/ispell -I$(srcdir)/wordparser $(CPPFLAGS)
 
 MODULE_big = tsearch2
 OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
@@ -35,7 +35,7 @@ include $(top_srcdir)/contrib/contrib-global.mk
 install: installstop
 
 installstop:
-   cp stopword/*.stop $(datadir)
+   cp $(srcdir)/stopword/*.stop $(datadir)
 
 
 tsearch2.sql.in: tsearch.sql._in

diff --git a/contrib/tsearch2/ispell/Makefile b/contrib/tsearch2/ispell/Makefile
index def0c3126c834172701c70c6c9b53db5e0fd6c28..a02e6a82ae61ea8644d44d4661a171b96237e49a 100644 (file)
--- a/contrib/tsearch2/ispell/Makefile
+++ b/contrib/tsearch2/ispell/Makefile
@@ -3,7 +3,7 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I. -I.. $(CPPFLAGS)
+override CPPFLAGS := -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS)
 
 SUBOBJS = spell.o 
 

diff --git a/contrib/tsearch2/snowball/Makefile b/contrib/tsearch2/snowball/Makefile
index 94e48fb466272bd6676697a57b80bb616cb2dc67..7ba59e24dcb8bab131de5fa8821ad07b7faea661 100644 (file)
--- a/contrib/tsearch2/snowball/Makefile
+++ b/contrib/tsearch2/snowball/Makefile
@@ -3,7 +3,7 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I. -I.. $(CPPFLAGS)
+override CPPFLAGS := -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS)
 
 SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
 

diff --git a/contrib/tsearch2/wordparser/Makefile b/contrib/tsearch2/wordparser/Makefile
index 8fa1e1f06ae71d6e829d30b312b64b3c2afb547d..5322f40696f3dd480487f88e8a10f207497aee27 100644 (file)
--- a/contrib/tsearch2/wordparser/Makefile
+++ b/contrib/tsearch2/wordparser/Makefile
@@ -3,7 +3,7 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 
-override CPPFLAGS := -I. -I.. $(CPPFLAGS)
+override CPPFLAGS := -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS)
 
 SUBOBJS =  parser.o deflex.o