Commit f7587aeb authored by Bruce Momjian's avatar Bruce Momjian

> 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
parent 92259946
# -*-makefile-*- # -*-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, # All PostgreSQL makefiles include this file and use the variables it sets,
...@@ -360,7 +360,7 @@ ifneq (,$(LIBOBJS)) ...@@ -360,7 +360,7 @@ ifneq (,$(LIBOBJS))
LIBS := -lpgport $(LIBS) LIBS := -lpgport $(LIBS)
ifdef PGXS ifdef PGXS
# where libpgport.a is installed # where libpgport.a is installed
LDFLAGS := -L$(pkglibdir) $(LDFLAGS) LDFLAGS := -L$(libdir) $(LDFLAGS)
else else
LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS) LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS)
endif endif
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# with broken/missing library files. # with broken/missing library files.
# IDENTIFICATION # 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 ...@@ -22,10 +22,10 @@ all: libpgport.a
# libpgport is needed by some contrib # libpgport is needed by some contrib
install-all-headers: install-all-headers:
$(INSTALL_STLIB) libpgport.a $(DESTDIR)$(pkglibdir) $(INSTALL_STLIB) libpgport.a $(DESTDIR)$(libdir)
uninstall: uninstall:
$(RM) $(DESTDIR)$(pkglibdir)/libpgport.a $(RM) $(DESTDIR)$(libdir)/libpgport.a
libpgport.a: $(LIBOBJS) libpgport.a: $(LIBOBJS)
$(AR) $(AROPT) $@ $^ $(AR) $(AROPT) $@ $^
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment