tweaks to os x

svn path=/branches/v0_99_maint/; revision=7533

Author: jdh2358

Makefile

@@ -28,9 +28,12 @@ pyback:
 	tar cvfz pyback.tar.gz *.py lib src examples/*.py  unit/*.py
 
 
-build_osx105:
+_build_osx105:
 	CFLAGS="-Os -arch i386 -arch ppc" LDFLAGS="-Os -arch i386 -arch ppc" python setup.py build
 
+build_osx105:
+	echo "Use 'make -f fetch deps mpl_install instead'"
+
 
 jdh_doc_snapshot:
 	svn up;\

README.osx

@@ -0,0 +1,13 @@
+Build mpl on OSX has proven to be a nightmare because of all the
+different types of zlib, png and freetype that may be on your system.
+The recommended and supported way to build is to use the make.osx file
+in this directory.  This script requires you to set a PREFIX
+environment variable where you want to the install to go.  It will
+fetch the dependencies from a remove server and install them into your
+PREFIX dir, and then build mpl against them.  It should ignore any
+lib, png or freetype on your system
+
+Example usage::
+
+  PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+

make.osx

@@ -1,13 +1,11 @@
-PREFIX=/Users/jdh2358/dev
+# build mpl into a local install dir with 
+# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+
 PYVERSION=2.6
 PYTHON=python${PYVERSION}
-SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
 FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
-BDISTMPKGVERSION=0.4.4
-MPLSRC=matplotlib-${MPLVERSION}
 MACOSX_DEPLOYMENT_TARGET=10.4
 
 ## You shouldn't need to configure past this point
@@ -26,9 +24,9 @@ clean:
 	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} 
 
 fetch:
-	python -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")'  &&\
-	python -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
-	python -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")'  &&\
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'