summaryrefslogtreecommitdiff
path: root/contrib/lo
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2004-08-20 20:13:10 +0000
committerBruce Momjian <bruce@momjian.us>2004-08-20 20:13:10 +0000
commitee85595d467ef6fad3afb0554b27e6ee9f061318 (patch)
treea989fe7c6cb179bbb7acfc8e2df42b84c2962cd8 /contrib/lo
parentff8e5526dd6a2b2e1378fc2e9b22ff4ad5fb07b5 (diff)
downloadpostgresql-ee85595d467ef6fad3afb0554b27e6ee9f061318.tar.gz
> 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/lo')
-rw-r--r--contrib/lo/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
index 963ded047b..17ac5008e1 100644
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
@@ -1,12 +1,16 @@
-# $PostgreSQL: pgsql/contrib/lo/Makefile,v 1.12 2003/11/29 19:51:35 pgsql Exp $
-
-subdir = contrib/lo
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
+# $PostgreSQL: pgsql/contrib/lo/Makefile,v 1.13 2004/08/20 20:13:05 momjian Exp $
MODULES = lo
DATA_built = lo.sql
DATA = lo_drop.sql lo_test.sql
DOCS = README.lo
+ifdef USE_PGXS
+PGXS = $(shell pg_config --pgxs)
+include $(PGXS)
+else
+subdir = contrib/lo
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
+endif