diff options
| author | Bruce Momjian | 2004-08-28 22:55:06 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2004-08-28 22:55:06 +0000 |
| commit | f7587aeba898b8b558741006564b86e9d298c0bc (patch) | |
| tree | 544fbb5e98c30d659167515eba235ed7b1eaeb81 | |
| parent | 922599464f620bdc7e73ffc65f927e7845fadadf (diff) | |
> 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
| -rw-r--r-- | src/Makefile.global.in | 4 | ||||
| -rw-r--r-- | src/port/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 6fa97a50b90..0d34231e588 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 886d177ed07..a5cc24c3865 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) $@ $^ |