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/xml2/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'contrib/xml2')

diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index 9e19eab0470..b2a4f2325e6 100644
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -1,7 +1,4 @@
 # This makefile will build the new XML and XSLT routines.
-subdir = contrib/xml2
-top_builddir = ../../
-include $(top_builddir)/src/Makefile.global
 
 MODULE_big = pgxml
 
@@ -14,5 +11,14 @@ SHLIB_LINK = -lxml2 -lxslt
 DATA_built = pgxml.sql
 DOCS = README.xml2
 
-include $(top_builddir)contrib/contrib-global.mk
+
+ifdef USE_PGXS
+PGXS = $(shell pg_config --pgxs)
+include $(PGXS)
+else
+subdir = contrib/xml2
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
 
-- 
cgit v1.2.3