openkylin
/
postgresql-12
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move libpgport/libpgcommon/libpgfeutils from libdir to pkglibdir 

This allows client applications to link to version-specific libraries.
Used by pg-checksums.
Forwarded: No, (somewhat) Debian specific

Gbp-Pq: Name libpgport-pkglibdir
This commit is contained in:
Christoph Berg 2022-05-14 02:43:37 +08:00 committed by openKylinBot
parent af7ffcf1f7
commit 65172e9dbf
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.global.in
View File

@ -562,8 +562,8 @@ libpq = -L$(libpq_builddir) -lpq
# on client link lines, since that also appears in $(LIBS).
# libpq_pgport_shlib is the same idea, but for use in client shared libraries.
ifdef PGXS
libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq)
else
libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq)

10
src/common/Makefile
View File

@ -79,15 +79,15 @@ distprep: kwlist_d.h
# libpgcommon is needed by some contrib
install: all installdirs
$(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
$(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
$(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
$(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(libdir)'
$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
uninstall:
rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a'
libpgcommon.a: $(OBJS_FRONTEND)
rm -f $@

6
src/fe_utils/Makefile
View File

@ -35,13 +35,13 @@ distprep: psqlscan.c
# libpgfeutils could be useful to contrib, so install it
install: all installdirs
$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a'
$(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(libdir)'
$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
uninstall:
rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a'
clean distclean:
rm -f libpgfeutils.a $(OBJS) lex.backup

10
src/port/Makefile
View File

@ -50,15 +50,15 @@ all: libpgport.a libpgport_shlib.a libpgport_srv.a
# libpgport is needed by some contrib
install: all installdirs
$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
$(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(libdir)/libpgport_shlib.a'
$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
$(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(libdir)'
$(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
uninstall:
rm -f '$(DESTDIR)$(libdir)/libpgport.a'
rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
rm -f '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a'
libpgport.a: $(OBJS)
rm -f $@