diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | src/Makefile.global.in | 14 | ||||
| -rw-r--r-- | src/port/Makefile | 9 |
3 files changed, 23 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 1221c332a32..8b40788e930 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/Makefile,v 1.33 2004/07/30 12:26:40 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile,v 1.34 2004/08/20 20:13:10 momjian Exp $ # #------------------------------------------------------------------------- @@ -35,6 +35,7 @@ install-local: installdirs-local install-all-headers: $(MAKE) -C include $@ + $(MAKE) -C port $@ installdirs: installdirs-local 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) diff --git a/src/port/Makefile b/src/port/Makefile index dc2ddee3e6a..886d177ed07 100644 --- a/src/port/Makefile +++ b/src/port/Makefile @@ -7,7 +7,7 @@ # with broken/missing library files. # IDENTIFICATION -# $PostgreSQL: pgsql/src/port/Makefile,v 1.16 2004/08/01 06:56:39 momjian Exp $ +# $PostgreSQL: pgsql/src/port/Makefile,v 1.17 2004/08/20 20:13:10 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,6 +20,13 @@ LIBS += $(PTHREAD_LIBS) all: libpgport.a +# libpgport is needed by some contrib +install-all-headers: + $(INSTALL_STLIB) libpgport.a $(DESTDIR)$(pkglibdir) + +uninstall: + $(RM) $(DESTDIR)$(pkglibdir)/libpgport.a + libpgport.a: $(LIBOBJS) $(AR) $(AROPT) $@ $^ |