summaryrefslogtreecommitdiff
path: root/contrib/pgstattuple
diff options
context:
space:
mode:
authorBruce Momjian2004-08-20 20:13:10 +0000
committerBruce Momjian2004-08-20 20:13:10 +0000
commitee85595d467ef6fad3afb0554b27e6ee9f061318 (patch)
treea989fe7c6cb179bbb7acfc8e2df42b84c2962cd8 /contrib/pgstattuple
parentff8e5526dd6a2b2e1378fc2e9b22ff4ad5fb07b5 (diff)
> Please find enclose a submission to fix these problems.
> > The patch adds missing the "libpgport.a" file to the installation under > "install-all-headers". It is needed by some contribs. I install the > library in "pkglibdir", but I was wondering whether it should be "libdir"? > I was wondering also whether it would make sense to have a "libpgport.so"? > > It fixes various macros which are used by contrib makefiles, especially > libpq_*dir and LDFLAGS when used under PGXS. It seems to me that they are > needed to > > It adds the ability to test and use PGXS with contribs, with "make > USE_PGXS=1". Without the macro, this is exactly as before, there should be > no difference, esp. wrt the vpath feature that seemed broken by previous > submission. So it should not harm anybody, and it is useful at least to me. > > It fixes some inconsistencies in various contrib makefiles > (useless override, ":=" instead of "="). Fabien COELHO
Diffstat (limited to 'contrib/pgstattuple')
-rw-r--r--contrib/pgstattuple/Makefile25
1 files changed, 14 insertions, 11 deletions
diff --git a/contrib/pgstattuple/Makefile b/contrib/pgstattuple/Makefile
index e1a94c0aa7..4f9b340393 100644
--- a/contrib/pgstattuple/Makefile
+++ b/contrib/pgstattuple/Makefile
@@ -2,21 +2,24 @@
#
# pgstattuple Makefile
#
-# $PostgreSQL: pgsql/contrib/pgstattuple/Makefile,v 1.2 2003/11/29 22:39:29 pgsql Exp $
+# $PostgreSQL: pgsql/contrib/pgstattuple/Makefile,v 1.3 2004/08/20 20:13:07 momjian Exp $
#
#-------------------------------------------------------------------------
+SRCS = pgstattuple.c
+
+MODULE_big = pgstattuple
+OBJS = $(SRCS:.c=.o)
+DOCS = README.pgstattuple README.pgstattuple.euc_jp
+DATA_built = pgstattuple.sql
+
+ifdef USE_PGXS
+PGXS = $(shell pg_config --pgxs)
+include $(PGXS)
+else
subdir = contrib/pgstattuple
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
-
-MODULE_big := pgstattuple
-SRCS += pgstattuple.c
-OBJS := $(SRCS:.c=.o)
-DOCS := README.pgstattuple README.pgstattuple.euc_jp
-DATA_built := pgstattuple.sql
-
-PG_CPPFLAGS :=
-SHLIB_LINK :=
-
include $(top_srcdir)/contrib/contrib-global.mk
+endif
+