rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

> Am Dienstag, 17. August 2004 14:26 schrieb Fabien COELHO: 

> > 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"?

Please find attached a small patch against current CVS head that fixes
pgport library installation so that it goes to libdir instead of
pkglibdir. It works for me.

Fabien Coelho
This commit is contained in:
Bruce Momjian 2004-08-28 22:55:06 +00:00
parent 922599464f
commit f7587aeba8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.global.in
View File

@ -1,5 +1,5 @@
# -*-makefile-*-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.193 2004/08/20 20:13:10 momjian Exp $
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.194 2004/08/28 22:55:06 momjian Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@ -360,7 +360,7 @@ ifneq (,$(LIBOBJS))
LIBS := -lpgport $(LIBS)
ifdef PGXS
# where libpgport.a is installed
LDFLAGS := -L$(pkglibdir) $(LDFLAGS)
LDFLAGS := -L$(libdir) $(LDFLAGS)
else
LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS)
endif

6
src/port/Makefile
View File

@ -7,7 +7,7 @@
# with broken/missing library files.
# IDENTIFICATION
# $PostgreSQL: pgsql/src/port/Makefile,v 1.17 2004/08/20 20:13:10 momjian Exp $
# $PostgreSQL: pgsql/src/port/Makefile,v 1.18 2004/08/28 22:55:06 momjian Exp $
#
#-------------------------------------------------------------------------
@ -22,10 +22,10 @@ all: libpgport.a
# libpgport is needed by some contrib
install-all-headers:
$(INSTALL_STLIB) libpgport.a $(DESTDIR)$(pkglibdir)
$(INSTALL_STLIB) libpgport.a $(DESTDIR)$(libdir)
uninstall:
$(RM) $(DESTDIR)$(pkglibdir)/libpgport.a
$(RM) $(DESTDIR)$(libdir)/libpgport.a
libpgport.a: $(LIBOBJS)
$(AR) $(AROPT) $@ $^