*** src/Makefile.shlib.orig	Sun Aug  7 23:35:13 2005
--- src/Makefile.shlib	Thu Oct 27 16:03:50 2005
***************
*** 309,315 ****
  # AIX case
  $(shlib): lib$(NAME).a
  	$(MKLDEXPORT) lib$(NAME).a > lib$(NAME)$(EXPSUFF)
! 	$(COMPILER) $(LDFLAGS_SL) -o $@ $< $(LDFLAGS) $(SHLIB_LINK) -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:lib$(NAME)$(EXPSUFF)
  	
  endif # PORTNAME == aix
  
--- 309,315 ----
  # AIX case
  $(shlib): lib$(NAME).a
  	$(MKLDEXPORT) lib$(NAME).a > lib$(NAME)$(EXPSUFF)
! 	$(COMPILER) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $< -Wl,-bE:lib$(NAME)$(EXPSUFF) $(SHLIB_LINK)
  	
  endif # PORTNAME == aix
  
*** src/makefiles/Makefile.aix.orig	Sun Jul 24 19:30:10 2005
--- src/makefiles/Makefile.aix	Thu Oct 27 16:02:13 2005
***************
*** 21,33 ****
  
  POSTGRES_IMP= postgres$(IMPSUFF)
  
  MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
  
  %$(EXPSUFF): %.o
  	$(MKLDEXPORT) $*.o > $*$(EXPSUFF)
  
  %$(DLSUFFIX): %.o %$(EXPSUFF)
! 	@echo Making shared library $@ from $*.o, $*$(EXPSUFF) and postgres.imp
! 	$(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:$*$(EXPSUFF) $(SHLIB_LINK)
  
  sqlmansect = 7
--- 21,38 ----
  
  POSTGRES_IMP= postgres$(IMPSUFF)
  
+ ifdef PGXS
+ BE_DLLLIBS= -Wl,-bI:$(DESTDIR)$(bindir)/postgres/$(POSTGRES_IMP)
+ else
+ BE_DLLLIBS= -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP)
+ endif
+ 
  MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
  
  %$(EXPSUFF): %.o
  	$(MKLDEXPORT) $*.o > $*$(EXPSUFF)
  
  %$(DLSUFFIX): %.o %$(EXPSUFF)
! 	$(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*$(EXPSUFF) $(SHLIB_LINK)
  
  sqlmansect = 7