mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
Fix several contrib makefiles that failed in VPATH builds, particularly
when not using gcc (which has slightly nonstandard inclusion rules).
This commit is contained in:
@ -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 $
|
||||
|
||||
SUBOBJS = spell.o regis.o
|
||||
|
||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
|
||||
|
||||
PG_CPPFLAGS = -I$(srcdir)/..
|
||||
SUBOBJS = spell.o regis.o
|
||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
|
||||
|
||||
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
|
||||
|
@ -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 $
|
||||
|
||||
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
|
||||
|
||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
|
||||
|
||||
PG_CPPFLAGS = -I$(srcdir)/..
|
||||
SUBOBJS = english_stem.o api.o russian_stem.o utilities.o
|
||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS)
|
||||
|
||||
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
|
||||
|
@ -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 $
|
||||
|
||||
SUBOBJS = parser.o deflex.o
|
||||
|
||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
|
||||
|
||||
PG_CPPFLAGS = -I$(srcdir)/..
|
||||
SUBOBJS = parser.o deflex.o
|
||||
EXTRA_CLEAN = SUBSYS.o $(SUBOBJS) parser.c
|
||||
|
||||
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
|
||||
|
Reference in New Issue
Block a user