database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-18 05:01:01 +03:00
Code Activity

> Please find enclose a submission to fix these problems.

Browse Source 
>
> 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
This commit is contained in:
Bruce Momjian
2004-08-20 20:13:10 +00:00
parent ff8e5526dd
commit ee85595d46
43 changed files with 431 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@@ -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

14
src/Makefile.global.in
View File

@@ -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)

9
src/port/Makefile
View File

@@ -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) $@ $^