1 --- a/src/common/Makefile
2 +++ b/src/common/Makefile
3 @@ -59,13 +59,13 @@ all: libpgcommon.a libpgcommon_srv.a
5 # libpgcommon is needed by some contrib
6 install: all installdirs
7 - $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
8 + $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
11 - $(MKDIR_P) '$(DESTDIR)$(libdir)'
12 + $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
15 - rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
16 + rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
18 libpgcommon.a: $(OBJS_FRONTEND)
20 --- a/src/fe_utils/Makefile
21 +++ b/src/fe_utils/Makefile
22 @@ -35,13 +35,13 @@ distprep: psqlscan.c
24 # libpgfeutils could be useful to contrib, so install it
25 install: all installdirs
26 - $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a'
27 + $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
30 - $(MKDIR_P) '$(DESTDIR)$(libdir)'
31 + $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
34 - rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a'
35 + rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
38 rm -f libpgfeutils.a $(OBJS) lex.backup
39 --- a/src/port/Makefile
40 +++ b/src/port/Makefile
41 @@ -46,13 +46,13 @@ all: libpgport.a libpgport_srv.a
43 # libpgport is needed by some contrib
44 install: all installdirs
45 - $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
46 + $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
49 - $(MKDIR_P) '$(DESTDIR)$(libdir)'
50 + $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
53 - rm -f '$(DESTDIR)$(libdir)/libpgport.a'
54 + rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
58 --- a/src/Makefile.global.in
59 +++ b/src/Makefile.global.in
60 @@ -490,7 +490,7 @@ libpq = -L$(libpq_builddir) -lpq
61 # pgport before libpq. This does cause duplicate -lpgport's to appear
62 # on client link lines.
64 -libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
65 +libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
67 libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)