> 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

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 6fa97a50b901504abc95b999572513bcf814f250..0d34231e588534421f2092f403caa92538df6d63 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -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

diff --git a/src/port/Makefile b/src/port/Makefile
index 886d177ed07943dd097fb8a625723ff6daa239da..a5cc24c38659222ce2e858f59994777126af906c 100644 (file)
--- 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.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) $@ $^