--- Makefile.in.orig	2007-09-25 20:23:43.000000000 +0200
+++ Makefile.in	2007-09-25 20:23:56.000000000 +0200
@@ -177,16 +177,16 @@
 
 # Link flags and shared libs only
 SUP_LIBS =  $(GD_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \
-          $(JPEG_LIB) $(SDE_LIB) $(GDAL_LIB) $(MING_LIB) $(POSTGIS_LIB) \
+          $(JPEG_LIB) $(SDE_LIB) $(GDAL_LIB) $(MING_LIB) $(POSTGIS_LIB) $(ICONV_LIB) \
 	  $(MYGIS_LIB) $(CURL_LIB) $(ORACLESPATIAL_LIB) \
 	  $(THREAD_LIB) $(XTRALIBS) $(GEOS_LIB) $(ICONV_INC) $(XML2_INC)
 
 # STATIC_LIBS is full filename with path of libs that will be statically linked
 STATIC_LIBS= $(GD_STATIC)
 
-EXE_LDFLAGS =	$(RUNPATHS) -L. -lmap $(SUP_LIBS) $(STATIC_LIBS)
+EXE_LDFLAGS =	$(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
 
-LDFLAGS= $(RUNPATHS) -L../.. -lmap $(SUP_LIBS) $(STATIC_LIBS)
+LDFLAGS= $(RUNPATHS) -L../.. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
 
 # END OF CONFIGURE----
 
@@ -225,7 +225,7 @@
 
 mapscript_so: mapscript_wrap.c
 	$(CC) -fpic -c $(CCFLAGS) $(JAVA_INCLUDE) -fno-strict-aliasing mapscript_wrap.c
-	$(CC) -fpic -shared mapscript_wrap.o -o libmapscript.so $(LDFLAGS)
+	$(CXX) -fpic -dynamiclib -single_module mapscript_wrap.o -o libmapscript.dylib $(LDFLAGS)
 
 mapscript_java::
 	$(JAVAC) edu/umn/gis/mapscript/*.java