From e55e833f336fde0a32558cb20e8dc4656e5aabe1 Mon Sep 17 00:00:00 2001
From: Charles Moad <cwmoad@gmail.com>
Date: Mon, 25 May 2009 18:23:25 +0000
Subject: [PATCH] more win32 build updates

svn path=/trunk/matplotlib/; revision=7142
---
 release/win32/Makefile       | 17 +++++++++--------
 release/win32/data/setup.cfg |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/release/win32/Makefile b/release/win32/Makefile
index 609e5a93ea83..983be5c2b88a 100644
--- a/release/win32/Makefile
+++ b/release/win32/Makefile
@@ -1,4 +1,4 @@
-PYTHON=python
+PYTHON=C:/Python26/python.exe
 SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
@@ -23,12 +23,14 @@ fetch_deps:
 	wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2
 
 zlib:
+	rm -rf zlib-${ZLIBVERSION}
 	tar xvfz zlib-${ZLIBVERSION}.tar.gz
 	cd zlib-${ZLIBVERSION} &&\
 	./configure &&\
 	make -j3
 
 png: zlib
+	rm -rf libpng-${PNGVERSION}
 	tar xvfj libpng-${PNGVERSION}.tar.bz2
 	cd libpng-${PNGVERSION} &&\
 	export CFLAGS=${CFLAGS} &&\
@@ -38,10 +40,10 @@ png: zlib
 	cp .libs/libpng.a .
 
 freetype:
-	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+	rm -rf freetype-${FREETYPEVERSION}
+	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2
 	cd freetype-${FREETYPEVERSION} &&\
-	export GNUMAKE=mingw32-make &&\
-	./configure --disable-shared &&\
+	GNUMAKE=mingw32-make ./configure --disable-shared &&\
 	cp builds/win32/w32-mingw32.mk config.mk &&\
 	mingw32-make -j3 &&\
 	cp objs/libfreetype.a .
@@ -49,13 +51,12 @@ freetype:
 dependencies: png freetype
 
 installers:
-	tar xvzf matplotlib-${MPLVERSION}.tar.gz &&\
+	rm -rf matplotlib-${MPLVERSION}
+	tar xvzf matplotlib-${MPLVERSION}.tar.gz
 	cd matplotlib-${MPLVERSION} &&\
 	rm -rf build &&\
 	cp ../data/setup.cfg . &&\
-	export CFLAGS=${CFLAGS} &&\
-	export LDFLAGS=${LDFLAGS} &&\
 	${PYTHON} setup.py build -c mingw32 bdist_wininst &&\
-	${PYTHON) setupegg.py build -c mingw32 bdist_egg
+	${PYTHON} setupegg.py build -c mingw32 bdist_egg
 
 all: fetch_deps dependencies installers
diff --git a/release/win32/data/setup.cfg b/release/win32/data/setup.cfg
index 3f2b860597de..0bb6a91a81ab 100644
--- a/release/win32/data/setup.cfg
+++ b/release/win32/data/setup.cfg
@@ -2,7 +2,7 @@
 # build options.
 
 [egg_info]
-tag_svn_revision = 0
+tag_svn_revision = 1
 
 [status]
 # To suppress display of the dependencies and their versions