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 /src/Makefile.global.in | |
| 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 'src/Makefile.global.in')
| -rw-r--r-- | src/Makefile.global.in | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index c6fa0db8f41..6fa97a50b90 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.192 2004/08/15 00:41:51 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.193 2004/08/20 20:13:10 momjian Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -291,8 +291,15 @@ endif # # Some variables needed to find some client interfaces +ifdef PGXS +# some contribs assumes headers and libs are in the source tree... +libpq_srcdir = $(includedir) +libpq_builddir = $(libdir) +else libpq_srcdir = $(top_srcdir)/src/interfaces/libpq libpq_builddir = $(top_builddir)/src/interfaces/libpq +endif + libpq = -L$(libpq_builddir) -lpq submake-libpq: @@ -351,8 +358,13 @@ LIBOBJS = @LIBOBJS@ dirmod.o exec.o noblock.o path.o pipe.o pgsleep.o pgstrcasec ifneq (,$(LIBOBJS)) LIBS := -lpgport $(LIBS) +ifdef PGXS +# where libpgport.a is installed +LDFLAGS := -L$(pkglibdir) $(LDFLAGS) +else LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS) endif +endif # to make ws2_32.lib the last library ifeq ($(PORTNAME),win32) |