diff -cr postgis/Makefile.config.in postgis/Makefile.config.in
*** postgis/Makefile.config.in	Tue Jun 28 11:33:47 2005
--- postgis/Makefile.config.in	Fri Jul  1 07:48:32 2005
***************
*** 64,70 ****
  # Set USE_ICONV to 1 if you want the loader (shp2pgsql)
  # to support UTF-8 output.
  #
! USE_ICONV=@USE_ICONV@
  
  #
  # PGSQL
--- 64,70 ----
  # Set USE_ICONV to 1 if you want the loader (shp2pgsql)
  # to support UTF-8 output.
  #
! USE_ICONV=0
  
  #
  # PGSQL
diff -cr postgis/lwgeom/Makefile postgis/lwgeom/Makefile
*** postgis/lwgeom/Makefile	Tue Jun 28 14:51:18 2005
--- postgis/lwgeom/Makefile	Fri Jul  1 06:59:28 2005
***************
*** 139,146 ****
  	@mkdir -p $(DESTDIR)$(MODULE_INSTALLDIR)
  	$(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(MODULE_INSTALLDIR)/$(SHLIB)
  
! ifneq ($(PORTNAME), cygwin)
! ifneq ($(PORTNAME), win32)
  ifneq ($(PORTNAME), win)
  ifneq ($(SHLIB), $(SHLIB_MAJOR))
  	cd $(DESTDIR)$(MODULE_INSTALLDIR) && \
--- 139,146 ----
  	@mkdir -p $(DESTDIR)$(MODULE_INSTALLDIR)
  	$(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(MODULE_INSTALLDIR)/$(SHLIB)
  
! #ifneq ($(PORTNAME), cygwin)
! #ifneq ($(PORTNAME), win32)
  ifneq ($(PORTNAME), win)
  ifneq ($(SHLIB), $(SHLIB_MAJOR))
  	cd $(DESTDIR)$(MODULE_INSTALLDIR) && \
***************
*** 153,160 ****
  	ln -sf $(SHLIB) $(SHLIB_BARE)
  endif
  endif # not win
! endif # not win32
! endif # not cygwin
  
  uninstall-lwgeom-lib: 
  	rm -f $(DESTDIR)$(MODULE_INSTALLDIR)/$(SHLIB)
--- 153,160 ----
  	ln -sf $(SHLIB) $(SHLIB_BARE)
  endif
  endif # not win
! #endif # not win32
! #endif # not cygwin
  
  uninstall-lwgeom-lib: 
  	rm -f $(DESTDIR)$(MODULE_INSTALLDIR)/$(SHLIB)
diff -cr postgis/lwgeom/Makefile.shlib postgis/lwgeom/Makefile.shlib
*** postgis/lwgeom/Makefile.shlib	Tue Jun  7 07:51:08 2005
--- postgis/lwgeom/Makefile.shlib	Fri Jul  1 06:52:43 2005
***************
*** 230,236 ****
  endif
  
  ifeq ($(PORTNAME), win32)
!   shlib			= lib$(NAME)$(DLSUFFIX)
    haslibarule   = yes
  endif
  
--- 230,238 ----
  endif
  
  ifeq ($(PORTNAME), win32)
!   DLLTOOL = dlltool
!   DLLWRAP = dllwrap
!   shlib			= lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
    haslibarule   = yes
  endif
  
***************
*** 335,341 ****
  $(shlib) lib$(NAME).a: $(OBJS)
  ifndef DLL_DEFFILE
  	$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
! 	$(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
  	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
  else
  	$(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(DLL_DEFFILE) $(OBJS) $(SHLIB_LINK)
--- 337,343 ----
  $(shlib) lib$(NAME).a: $(OBJS)
  ifndef DLL_DEFFILE
  	$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
! 	$(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK) $(PGBELIBS)
  	$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
  else
  	$(DLLWRAP) $(LDFLAGS_SL) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(DLL_DEFFILE) $(OBJS) $(SHLIB_LINK)