*** ./src/Makefile.shlib.orig	Fri Jul 16 16:21:06 1999
--- ./src/Makefile.shlib	Fri Jul 16 17:24:50 1999
***************
*** 58,64 ****
  
  ifeq ($(PORTNAME), irix5)
    install-shlib-dep := install-shlib
!   shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO__MINOR_VERSION)
    LDFLAGS_SL := -shared
    CFLAGS += $(CFLAGS_SL)
  endif
--- 58,64 ----
  
  ifeq ($(PORTNAME), irix5)
    install-shlib-dep := install-shlib
!   shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
    LDFLAGS_SL := -shared
    CFLAGS += $(CFLAGS_SL)
  endif
***************
*** 181,186 ****
--- 181,192 ----
    shlib				:= $(NAME)$(DLSUFFIX)
  endif
  
+ ifeq ($(PORTNAME), aix)
+   install-shlib-dep	:= install-shlib
+   shlib				:= $(NAME)$(DLSUFFIX)
+   SHLIB_LINK		+= -lc
+ endif
+ 
  # Default target definition.  Note shlib is empty if not building a shlib.
  
  all: lib$(NAME).a $(shlib)
***************
*** 199,204 ****
--- 205,211 ----
  
  ifneq ($(shlib),)
  ifneq ($(PORTNAME), win)
+ ifneq ($(PORTNAME), aix)
  
  $(shlib): $(OBJS)
  	$(LD) $(LDFLAGS_SL) -o $@ $(OBJS) $(SHLIB_LINK)
***************
*** 210,216 ****
--- 217,228 ----
  		rm -f lib$(NAME)$(DLSUFFIX); \
  		$(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX); \
  	fi
+ else
  
+ $(shlib): lib$(NAME).a
+ 	$(MKLDEXPORT) lib$(NAME).a $(LIBDIR) > lib$(NAME)$(EXPSUFF)
+ 	$(LD) -H512 -bM:SRE -bI:$(SRCDIR)/backend/$(POSTGRES_IMP) -bE:lib$(NAME)$(EXPSUFF) -o $@ $< $(LDFLAGS) $(SHLIB_LINK)
+ endif
  else
  
  $(shlib) lib$(NAME).a: $(OBJS) $(SRCDIR)/utils/dllinit.o