diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 6fa97a50b9..0d34231e58 100644 --- 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 886d177ed0..a5cc24c386 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.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) $@ $^