- libpgport patch from debian

[packages/postgresql.git] / libpgport-pkglibdir.patch

diff --git a/libpgport-pkglibdir.patch b/libpgport-pkglibdir.patch
new file mode 100644 (file)
index 0000000..1f67846
--- /dev/null
+++ b/libpgport-pkglibdir.patch
@@ -0,0 +1,68 @@
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -59,13 +59,13 @@ all: libpgcommon.a libpgcommon_srv.a
+ 
+ # libpgcommon is needed by some contrib
+ install: all installdirs
+-      $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(libdir)/libpgcommon.a'
++      $(INSTALL_STLIB) libpgcommon.a '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
+ 
+ installdirs:
+-      $(MKDIR_P) '$(DESTDIR)$(libdir)'
++      $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 
+ uninstall:
+-      rm -f '$(DESTDIR)$(libdir)/libpgcommon.a'
++      rm -f '$(DESTDIR)$(pkglibdir)/libpgcommon.a'
+ 
+ libpgcommon.a: $(OBJS_FRONTEND)
+       rm -f $@
+--- 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
+--- a/src/port/Makefile
++++ b/src/port/Makefile
+@@ -46,13 +46,13 @@ all: libpgport.a libpgport_srv.a
+ 
+ # libpgport is needed by some contrib
+ install: all installdirs
+-      $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
++      $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(pkglibdir)/libpgport.a'
+ 
+ installdirs:
+-      $(MKDIR_P) '$(DESTDIR)$(libdir)'
++      $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+ 
+ uninstall:
+-      rm -f '$(DESTDIR)$(libdir)/libpgport.a'
++      rm -f '$(DESTDIR)$(pkglibdir)/libpgport.a'
+ 
+ libpgport.a: $(OBJS)
+       rm -f $@
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -490,7 +490,7 @@ libpq = -L$(libpq_builddir) -lpq
+ # pgport before libpq.  This does cause duplicate -lpgport's to appear
+ # on client link lines.
+ ifdef PGXS
+-libpq_pgport = -L$(libdir) -lpgcommon -lpgport $(libpq)
++libpq_pgport = -L$(pkglibdir) -lpgcommon -lpgport $(libpq)
+ else
+ libpq_pgport = -L$(top_builddir)/src/common -lpgcommon -L$(top_builddir)/src/port -lpgport $(libpq)
+ endif