101 lines
3.7 KiB
Plaintext
101 lines
3.7 KiB
Plaintext
From: Christoph Berg <myon@debian.org>
|
|
Date: Sat, 14 May 2022 02:43:37 +0800
|
|
Subject: 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
|
|
---
|
|
src/Makefile.global.in | 4 ++--
|
|
src/common/Makefile | 10 +++++-----
|
|
src/fe_utils/Makefile | 6 +++---
|
|
src/port/Makefile | 10 +++++-----
|
|
4 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
|
|
index a037ac5..17f46f1 100644
|
|
--- a/src/Makefile.global.in
|
|
+++ b/src/Makefile.global.in
|
|
@@ -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)
|
|
diff --git a/src/common/Makefile b/src/common/Makefile
|
|
index 01cc2e0..62ace8c 100644
|
|
--- a/src/common/Makefile
|
|
+++ b/src/common/Makefile
|
|
@@ -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 $@
|
|
diff --git a/src/fe_utils/Makefile b/src/fe_utils/Makefile
|
|
index 7d73800..5dd2360 100644
|
|
--- a/src/fe_utils/Makefile
|
|
+++ b/src/fe_utils/Makefile
|
|
@@ -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
|
|
diff --git a/src/port/Makefile b/src/port/Makefile
|
|
index b9492b7..9f0d1e7 100644
|
|
--- a/src/port/Makefile
|
|
+++ b/src/port/Makefile
|
|
@@ -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 $@
|