| 1 |
Author: Christoph Berg <[email protected]> |
| 2 |
Description: Move libpgport/libpgcommon/libpgfeutils from libdir to pkglibdir |
| 3 |
This allows client applications to link to version-specific libraries. |
| 4 |
Used by pg-checksums. |
| 5 |
Forwarded: No, (somewhat) Debian specific |
| 6 |
|
| 7 |
--- a/src/common/Makefile |
| 8 |
+++ b/src/common/Makefile |
| 9 |
@@ -126,15 +126,15 @@ distprep: kwlist_d.h |
| 10 |
|
| 11 |
# libpgcommon is needed by some contrib |
| 12 |
install: all installdirs |
| 13 |
- $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a' |
| 14 |
- $(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(libdir)/libpgcommon_shlib.a' |
| 15 |
+ $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a' |
| 16 |
+ $(INSTALL_STLIB) libpgcommon_shlib.a '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a' |
| 17 |
|
| 18 |
installdirs: |
| 19 |
- $(MKDIR_P) '$(DESTDIR)$(libdir)' |
| 20 |
+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' |
| 21 |
|
| 22 |
uninstall: |
| 23 |
- rm -f '$(DESTDIR)$(libdir)/libpgcommon.a' |
| 24 |
- rm -f '$(DESTDIR)$(libdir)/libpgcommon_shlib.a' |
| 25 |
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a' |
| 26 |
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon_shlib.a' |
| 27 |
|
| 28 |
libpgcommon.a: $(OBJS_FRONTEND) |
| 29 |
rm -f $@ |
| 30 |
--- a/src/fe_utils/Makefile |
| 31 |
+++ b/src/fe_utils/Makefile |
| 32 |
@@ -52,13 +52,13 @@ distprep: psqlscan.c |
| 33 |
|
| 34 |
# libpgfeutils could be useful to contrib, so install it |
| 35 |
install: all installdirs |
| 36 |
- $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(libdir)/libpgfeutils.a' |
| 37 |
+ $(INSTALL_STLIB) libpgfeutils.a '$(DESTDIR)$(pkglibdir)/libpgfeutils.a' |
| 38 |
|
| 39 |
installdirs: |
| 40 |
- $(MKDIR_P) '$(DESTDIR)$(libdir)' |
| 41 |
+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' |
| 42 |
|
| 43 |
uninstall: |
| 44 |
- rm -f '$(DESTDIR)$(libdir)/libpgfeutils.a' |
| 45 |
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgfeutils.a' |
| 46 |
|
| 47 |
clean distclean: |
| 48 |
rm -f libpgfeutils.a $(OBJS) lex.backup |
| 49 |
--- a/src/port/Makefile |
| 50 |
+++ b/src/port/Makefile |
| 51 |
@@ -70,15 +70,15 @@ all: libpgport.a libpgport_shlib.a libpg |
| 52 |
|
| 53 |
# libpgport is needed by some contrib |
| 54 |
install: all installdirs |
| 55 |
- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a' |
| 56 |
- $(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(libdir)/libpgport_shlib.a' |
| 57 |
+ $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a' |
| 58 |
+ $(INSTALL_STLIB) libpgport_shlib.a '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a' |
| 59 |
|
| 60 |
installdirs: |
| 61 |
- $(MKDIR_P) '$(DESTDIR)$(libdir)' |
| 62 |
+ $(MKDIR_P) '$(DESTDIR)$(pkglibdir)' |
| 63 |
|
| 64 |
uninstall: |
| 65 |
- rm -f '$(DESTDIR)$(libdir)/libpgport.a' |
| 66 |
- rm -f '$(DESTDIR)$(libdir)/libpgport_shlib.a' |
| 67 |
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a' |
| 68 |
+ rm -f '$(DESTDIR)$(pkglibdir)/libpgport_shlib.a' |
| 69 |
|
| 70 |
libpgport.a: $(OBJS) |
| 71 |
rm -f $@ |
| 72 |
--- a/src/Makefile.global.in |
| 73 |
+++ b/src/Makefile.global.in |
| 74 |
@@ -608,7 +608,7 @@ libpq_pgport = $(libpq) |
| 75 |
# done if they don't, since they will have satisfied all their references |
| 76 |
# from these libraries.) |
| 77 |
ifdef PGXS |
| 78 |
-libpq_pgport_shlib = -L$(libdir) -lpgcommon_shlib -lpgport_shlib $(libpq) |
| 79 |
+libpq_pgport_shlib = -L$(pkglibdir) -lpgcommon_shlib -lpgport_shlib $(libpq) |
| 80 |
else |
| 81 |
libpq_pgport_shlib = -L$(top_builddir)/src/common -lpgcommon_shlib -L$(top_builddir)/src/port -lpgport_shlib $(libpq) |
| 82 |
endif |