diff options
| author | Bruce Momjian | 2004-08-20 20:13:10 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2004-08-20 20:13:10 +0000 |
| commit | ee85595d467ef6fad3afb0554b27e6ee9f061318 (patch) | |
| tree | a989fe7c6cb179bbb7acfc8e2df42b84c2962cd8 /contrib/cube | |
| parent | ff8e5526dd6a2b2e1378fc2e9b22ff4ad5fb07b5 (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/cube')
| -rw-r--r-- | contrib/cube/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile index 28ba3aaf1c0..f4b0d0b5017 100644 --- a/contrib/cube/Makefile +++ b/contrib/cube/Makefile @@ -1,8 +1,4 @@ -# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.11 2003/11/29 19:51:21 pgsql Exp $ - -subdir = contrib/cube -top_builddir = ../.. -include $(top_builddir)/src/Makefile.global +# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.12 2004/08/20 20:13:02 momjian Exp $ MODULE_big = cube OBJS= cube.o cubeparse.o @@ -11,6 +7,19 @@ DATA_built = cube.sql DOCS = README.cube REGRESS = cube +EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h + + +ifdef USE_PGXS +PGXS = $(shell pg_config --pgxs) +include $(PGXS) +else +subdir = contrib/cube +top_builddir = ../.. +include $(top_builddir)/src/Makefile.global +include $(top_srcdir)/contrib/contrib-global.mk +endif + # cubescan is compiled as part of cubeparse cubeparse.o: cubescan.c @@ -32,8 +41,3 @@ ifdef FLEX else @$(missing) flex $< $@ endif - -EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h - - -include $(top_srcdir)/contrib/contrib-global.mk |