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/dbase | |
| 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/dbase')
| -rw-r--r-- | contrib/dbase/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/contrib/dbase/Makefile b/contrib/dbase/Makefile index ddf03ecd38d..a39b5a8a571 100644 --- a/contrib/dbase/Makefile +++ b/contrib/dbase/Makefile @@ -1,8 +1,4 @@ -# $PostgreSQL: pgsql/contrib/dbase/Makefile,v 1.5 2003/11/29 19:51:22 pgsql Exp $ - -subdir = contrib/dbase -top_builddir = ../.. -include $(top_builddir)/src/Makefile.global +# $PostgreSQL: pgsql/contrib/dbase/Makefile,v 1.6 2004/08/20 20:13:02 momjian Exp $ PROGRAM = dbf2pg OBJS = dbf.o dbf2pg.o endian.o @@ -18,4 +14,13 @@ PG_LIBS = $(libpq) DOCS = README.dbf2pg MAN = dbf2pg.1 # XXX not implemented + +ifdef USE_PGXS +PGXS = $(shell pg_config --pgxs) +include $(PGXS) +else +subdir = contrib/dbase +top_builddir = ../.. +include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk +endif |