From ee85595d467ef6fad3afb0554b27e6ee9f061318 Mon Sep 17 00:00:00 2001
From: Bruce Momjian
Date: Fri, 20 Aug 2004 20:13:10 +0000
Subject: > 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
---
 contrib/mSQL-interface/Makefile | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'contrib/mSQL-interface')

diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile
index cc80053cdfb..2c26156ec6c 100644
--- a/contrib/mSQL-interface/Makefile
+++ b/contrib/mSQL-interface/Makefile
@@ -1,19 +1,23 @@
 #
-# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.8 2003/11/29 19:51:35 pgsql Exp $
+# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.9 2004/08/20 20:13:05 momjian Exp $
 #
 
+NAME	= mpgsql
+SO_MAJOR_VERSION = 0
+SO_MINOR_VERSION = 0
+OBJS	= mpgsql.o
+
+PG_CPPFLAGS = -I$(libpq_srcdir)
+
+ifdef USE_PGXS
+PGXS = $(shell pg_config --pgxs)
+include $(PGXS)
+else
 subdir = contrib/mSQL-interface
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
-
-NAME	:= mpgsql
-SO_MAJOR_VERSION := 0
-SO_MINOR_VERSION := 0
-OBJS	:= mpgsql.o
-
-override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
-
-include $(top_srcdir)/src/Makefile.shlib
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
 
 all: all-lib
 
-- 
cgit v1.2.3