--- ./config.make.org	2004-02-02 19:51:35.000000000 +0900
+++ ./config.make	2006-01-26 12:08:30.000000000 +0900
@@ -4,3 +4,11 @@
 # zlib required for both image formats and for compressed swf6
 LIBS = -lz -lungif -lpng12
 EXTRA_LIBS = ${LIBS}
+
+ifeq ($(shell uname -s), Darwin)
+  SO_FLAGS = -dynamiclib
+  SO_SUF = .dylib
+else
+  SO_FLAGS = -shared
+  SO_SUF = .so
+endif
--- ./Makefile.org	2004-02-01 08:06:56.000000000 +0900
+++ ./Makefile	2006-01-26 12:28:57.000000000 +0900
@@ -18,11 +18,11 @@
 	install -m 0644 mingpp.h $(INCLUDEDIR)
 
 install-dynamic: dynamic
-	install -m 0644 $(SHAREDLIB) $(LIBDIR)/
-	(cd $(LIBDIR) && ln -fs $(SHAREDLIB) libming.so.0 && ln -fs libming.so.0 libming.so)
+	install -m 0644 $(SHAREDLIB) $(LIBDIR)/libming${SO_V_SUF}
+	(cd $(LIBDIR) && ln -fs libming${SO_V_SUF} libming${SO_0_SUF} && ln -fs libming${SO_0_SUF} libming${SO_SUF})
 
 install-static: static
-	install -m 0644 $(SHAREDLIB) $(LIBDIR)/
+	install -m 0644 $(STATICLIB) $(LIBDIR)/
 
 dynamic static:
 	make -C src $@
@@ -31,5 +31,4 @@
 	for i in $(DIRS); do make -C $$i clean; done
 	if [ -f perl_ext/Makefile ] ; then cd perl_ext; make clean; fi
 	rm -f test.o test test.exe *.core *~
-	rm -f $(SHAREDLIB) $(SHAREDLIB)
-	rm -f libming.a libming.so
+	rm -f libming.a libming${SO_SUF}
--- ./Rules.make.org	2004-02-02 21:24:12.000000000 +0900
+++ ./Rules.make	2006-01-26 12:27:25.000000000 +0900
@@ -7,17 +7,27 @@
 INCLUDES       := -I. $(INCLUDES)
 LDLIBS         = $(LIBS)
 
+ifeq ($(shell uname -s), Darwin)
+  SO_FLAGS = -dynamiclib
+  SO_SUF = .dylib
+  SO_0_SUF = .0${SO_SUF}
+  SO_V_SUF = .${MING_VER}${SO_SUF}
+else
+  SO_FLAGS = -shared
+  SO_SUF = .so
+  SO_0_SUF = ${SO_SUF}.0
+  SO_V_SUF = ${SO_SUF}.${MING_VER}
+endif
+
 STATICLIB      = libming.a
-SHAREDLIB      = libming.so.$(MING_VER)
+SHAREDLIB      = libming${SO_SUF}
 
 override CFLAGS                := -O2 -Wall $(INCLUDES) $(CFLAGS)
 override LDFLAGS       :=  $(LDFLAGS)
 
-SHLIBLDFLAGS   = -static
+SHLIBLDFLAGS   = ${SO_FLAGS}
 
 ifeq ($(OS), Darwin)
        override CFLAGS         += -fno-common
-       SHLIBLDFLAGS            = -dynamiclib
-       SHAREDLIB                       = libming.$(MING_VER).dylib
 else
 endif
--- ./src/Makefile.org	2004-02-02 21:24:54.000000000 +0900
+++ ./src/Makefile	2006-01-26 12:08:30.000000000 +0900
@@ -36,8 +36,8 @@
 dynamic: ${OFILES}
 	cd blocks && make
 	cd actioncompiler && make
-	${CC} ${OFILES} ${COMPILEROFILES} ${LDFLAGS} ${EXTRA_LIBS} blocks/*.o -shared -o libming.so
-	cp libming.so ..
+	${CC} ${OFILES} ${COMPILEROFILES} ${LDFLAGS} ${EXTRA_LIBS} blocks/*.o ${SO_FLAGS} -o libming${SO_SUF}
+	cp libming${SO_SUF} ..
 
 static: ${OFILES}
 	cd blocks && make
@@ -49,7 +49,7 @@
 clean:
 	cd blocks && make clean
 	cd actioncompiler && make clean
-	rm -f *.o libming.a libming.so test test.exe core *.core
+	rm -f *.o libming.a libming${SO_SUF} test test.exe core *.core
 
 # breaks on bsd:
 #.c.o: .c .h