diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-08-20 20:13:10 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-08-20 20:13:10 +0000 |
| commit | ee85595d467ef6fad3afb0554b27e6ee9f061318 (patch) | |
| tree | a989fe7c6cb179bbb7acfc8e2df42b84c2962cd8 /contrib/ltree | |
| parent | ff8e5526dd6a2b2e1378fc2e9b22ff4ad5fb07b5 (diff) | |
| download | postgresql-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/ltree')
| -rw-r--r-- | contrib/ltree/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/ltree/Makefile b/contrib/ltree/Makefile index 0e10be39d7..bc64e009b6 100644 --- a/contrib/ltree/Makefile +++ b/contrib/ltree/Makefile @@ -1,7 +1,3 @@ -subdir = contrib/ltree -top_builddir = ../.. -include $(top_builddir)/src/Makefile.global - PG_CPPFLAGS = -DLOWER_NODE MODULE_big = ltree OBJS = ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \ @@ -10,4 +6,12 @@ DATA_built = ltree.sql DOCS = README.ltree REGRESS = ltree +ifdef USE_PGXS +PGXS = $(shell pg_config --pgxs) +include $(PGXS) +else +subdir = contrib/ltree +top_builddir = ../.. +include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk +endif |