--- ./libopenjpeg/opj_malloc.h.org	2007-12-21 19:19:01.000000000 +0900
+++ ./libopenjpeg/opj_malloc.h	2010-08-04 19:04:56.000000000 +0900
@@ -75,7 +75,7 @@
 #else /* Not WIN32 */
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
-		#elif defined(__GNUC__)
+		#elif defined(__GNUC__) && !defined(__APPLE__)
 			#define HAVE_MEMALIGN
 			#include <malloc.h>		
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
--- ./Makefile.org	2007-12-21 19:39:41.000000000 +0900
+++ ./Makefile	2010-08-04 19:06:20.000000000 +0900
@@ -69,10 +69,10 @@
 	rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
 
 osx:
-	make -f Makefile.osx
+	$(MAKE) $(MAKEFLAGS) -f Makefile.osx
 
 osxinstall:
-	make -f Makefile.osx install
+	$(MAKE) $(MAKEFLAGS) -f Makefile.osx install
 
 osxclean:
-	make -f Makefile.osx clean
+	$(MAKE) $(MAKEFLAGS) -f Makefile.osx clean
--- ./Makefile.osx.org	2007-06-05 18:00:34.000000000 +0900
+++ ./Makefile.osx	2010-08-04 19:04:56.000000000 +0900
@@ -8,11 +8,11 @@
 INCLUDE = -Ilibopenjpeg
 
 # General configuration variables:
-CC = gcc
-LIBTOOLSTAT = libtool
-LIBTOOLDYN = gcc
+CC = gcc $(TARGET_ARCH)
+LIBTOOLSTAT = /usr/bin/libtool
+LIBTOOLDYN = gcc $(TARGET_ARCH)
 
-PREFIX = /usr
+PREFIX = /opt/local
 INSTALL_LIBDIR = $(PREFIX)/lib
 INSTALL_INCLUDE = $(PREFIX)/include
 
@@ -51,7 +51,7 @@
 	$(LIBTOOLSTAT) -o $@ $(MODULES)
 
 $(SHAREDLIB): $(MODULES)
-	$(LIBTOOLDYN) -dynamiclib -o $@ $(MODULES)
+	$(LIBTOOLDYN) -dynamiclib -install_name $(INSTALL_LIBDIR)/$@ -current_version $(VER_MAJOR).$(basename $(VER_MINOR)) -compatibility_version $(VER_MAJOR) -o $@ $(MODULES)
 
 install:
 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'