From 41611f16e933dafa9c3ae0477f89537ea1459eb6 Mon Sep 17 00:00:00 2001 From: Robert Haas <rhaas@postgresql.org> Date: Sun, 23 Jan 2011 23:07:55 -0500 Subject: [PATCH] PGXS support for contrib/hstore Joey Adams --- contrib/hstore/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile index e466b6f7064..1d533fdd602 100644 --- a/contrib/hstore/Makefile +++ b/contrib/hstore/Makefile @@ -1,9 +1,5 @@ # contrib/hstore/Makefile -subdir = contrib/hstore -top_builddir = ../.. -include $(top_builddir)/src/Makefile.global - MODULE_big = hstore OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \ crc32.o @@ -12,4 +8,13 @@ DATA_built = hstore.sql DATA = uninstall_hstore.sql REGRESS = hstore +ifdef USE_PGXS +PG_CONFIG = pg_config +PGXS := $(shell $(PG_CONFIG) --pgxs) +include $(PGXS) +else +subdir = contrib/hstore +top_builddir = ../.. +include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk +endif -- GitLab