Fix PGXS support for building loadable modules on AIX.

Building a shlib on AIX requires use of the mkldexport.sh script, but we
failed to install that, preventing its use from non-source-tree contexts.
Also, Makefile.aix had the wrong idea about where to find the installed
copy of the postgres.imp symbol file used by AIX.

Per report from John Pierce.  Patch all the way back, since this has been
broken since the beginning of PGXS.

diff --git a/src/backend/Makefile b/src/backend/Makefile
index ec82d8d344ed77c8df328ecec69f1dfd3444d971..77334797bd9ee7787c6944dd4c53f4acb983408b 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -234,6 +234,7 @@ else
 endif
 ifeq ($(MAKE_EXPORTS), true)
        $(INSTALL_DATA) $(POSTGRES_IMP) '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
+       $(INSTALL_PROGRAM) $(MKLDEXPORT) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
 endif
 
 .PHONY: install-bin
@@ -252,6 +253,7 @@ endif
 endif
 ifeq ($(MAKE_EXPORTS), true)
        $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'
+       $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)'
 endif
 
 
@@ -261,6 +263,7 @@ uninstall:
        rm -f '$(DESTDIR)$(bindir)/postgres$(X)' '$(DESTDIR)$(bindir)/postmaster'
 ifeq ($(MAKE_EXPORTS), true)
        rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
+       rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
 endif
 ifeq ($(PORTNAME), cygwin)
 ifeq ($(MAKE_DLL), true)

diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index fc759ec082d1c9980ee6ba210277cde027e851e4..e5ad89d147007d4f6811e2c7f86e1a61be7dae62 100644 (file)
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -27,12 +27,13 @@ endif
 POSTGRES_IMP= postgres.imp
 
 ifdef PGXS
-BE_DLLLIBS= -Wl,-bI:$(bindir)/postgres/$(POSTGRES_IMP)
+BE_DLLLIBS= -Wl,-bI:$(pkglibdir)/$(POSTGRES_IMP)
 else
 BE_DLLLIBS= -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP)
 endif
 
-MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
+MKLDEXPORT_DIR=src/backend/port/aix
+MKLDEXPORT=$(top_srcdir)/$(MKLDEXPORT_DIR)/mkldexport.sh
 
 %.exp: %.o
        $(MKLDEXPORT) $^ >$@