From f237a80d8ae7bcde1089583dfcb74e2447e3c0a2 Mon Sep 17 00:00:00 2001 From: Tom Lane <tgl@sss.pgh.pa.us> Date: Mon, 4 Aug 2003 19:52:37 +0000 Subject: [PATCH] Fix to build correctly outside source tree. --- contrib/tsearch2/Makefile | 4 ++-- contrib/tsearch2/ispell/Makefile | 2 +- contrib/tsearch2/snowball/Makefile | 2 +- contrib/tsearch2/wordparser/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile index 7dd1e1b0810..6df6bcf3ba5 100644 --- 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 def0c3126c8..a02e6a82ae6 100644 --- 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 94e48fb4662..7ba59e24dcb 100644 --- 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 8fa1e1f06ae..5322f40696f 100644 --- 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 -- GitLab