update make.osx to find the local freetype etc

jdh2358 · jdh2358 · commit 84707ed1e8e9 · 2009-08-31T02:33:21.000Z
svn path=/trunk/matplotlib/; revision=7609
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -140,8 +140,8 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
             # space) in the following call to draw_text_image).
             font.set_text(s, 0, flags=LOAD_FORCE_AUTOHINT)
         font.draw_glyphs_to_bitmap()
-
-        #print x, y, int(x), int(y)
+        
+        #print x, y, int(x), int(y), s
 
         self._renderer.draw_text_image(font.get_image(), int(x), int(y) + 1, angle, gc)
 
diff --git a/make.osx b/make.osx
@@ -10,10 +10,7 @@ MACOSX_DEPLOYMENT_TARGET=10.4
 
 ## You shouldn't need to configure past this point
 
-CFLAGS="-Os -arch ppc -arch i386 -I{$PREFIX}/include"
-
-LDFLAGS="-arch ppc -arch i386 -L${PREFIX}/lib"
-
+PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
 CFLAGS_DEPS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
 LDFLAGS_DEPS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
 
@@ -32,7 +29,7 @@ fetch:
 
 
 zlib:
-	unset PKG_CONFIG_PATH &&\
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
 	rm -rf zlib-${ZLIBVERSION} &&\
 	tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
 	cd zlib-${ZLIBVERSION} &&\
@@ -44,7 +41,7 @@ zlib:
 	unset MACOSX_DEPLOYMENT_TARGET
 
 png: zlib
-	unset PKG_CONFIG_PATH &&\
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
 	rm -rf libpng-${PNGVERSION} &&\
 	tar xvfj libpng-${PNGVERSION}.tar.bz2
 	cd libpng-${PNGVERSION} &&\
@@ -58,7 +55,7 @@ png: zlib
 
 
 freetype: zlib
-	unset PKG_CONFIG_PATH &&\
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
 	rm -rf ${FREETYPEVERSION} &&\
 	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
 	cd freetype-${FREETYPEVERSION} &&\
@@ -75,13 +72,17 @@ deps: zlib png freetype
 	echo 'all done'
 
 mpl_build:
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
 	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
 	export CFLAGS=${CFLAGS_DEPS} &&\
 	export LDFLAGS=${LDFLAGS_DEPS} &&\
 	python setup.py build
 
 mpl_install:
+	export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
 	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
 	export CFLAGS=${CFLAGS_DEPS} &&\
 	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	export LD_LIBRARY_PATH=${PREFIX}/lib &&\
+	export DYLD_LIBRARY_PATH=${PREFIX}/lib &&\
 	python setup.py install --prefix=${PREFIX}
