   	cd ${MATPLOTLIB}; env PREFIX=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib ${MATPLOTLIB_DISPLAY} ${PREFIX}/bin/python setup.py install ${PYSETUP_OPT}
   	touch matplotlib
   
---- 248,256 ----
-  
-  matplotlib: ${MATPLOTLIB}.tar.gz python
-  	tar -xzf ${MATPLOTLIB}.tar.gz
-! 	cp win32_static.tar.gz ${MATPLOTLIB}
-! 	cd ${MATPLOTLIB}; tar -xzf win32_static.tar.gz
-! 	cd ${MATPLOTLIB}; env PREFIX=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib ${MATPLOTLIB_DISPLAY} ${PREFIX}/bin/python setup.py build --compiler=mingw32 bdist_wininst
-  	cd ${MATPLOTLIB}; env PREFIX=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib ${MATPLOTLIB_DISPLAY} ${PREFIX}/bin/python setup.py install ${PYSETUP_OPT}
-  	touch matplotlib
-  
+--- 245,253 ----
+  
+  matplotlib: ${MATPLOTLIB}.tar.gz python
+  	tar -xzf ${MATPLOTLIB}.tar.gz
+! 	cp win32_static.tar.gz ${MATPLOTLIB}
+! 	cd ${MATPLOTLIB}; tar -xzf win32_static.tar.gz
+! 	cd ${MATPLOTLIB}; env PREFIX=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib ${MATPLOTLIB_DISPLAY} ${PREFIX}/bin/python setup.py build --compiler=mingw32 bdist_wininst
+  	cd ${MATPLOTLIB}; env PREFIX=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib ${MATPLOTLIB_DISPLAY} ${PREFIX}/bin/python setup.py install ${PYSETUP_OPT}
+  	touch matplotlib
+  
 ***************
 *** 509,515 ****
   TILEWRAPPER = Tile

  
  gmp-clean: 
  	rm -rf ${GMP} 
--- 774,787 ----
  GMP_UNINSTALL += lib/libgmp.* 
  GMP_UNINSTALL += include/gmp.h
  
  gmp: ${GMP}.tar.gz
  	tar -xzf ${GMP}.tar.gz
! 	cd ${GMP}; ./configure --prefix="c:/topographica"
  	make -C ${GMP}
  	make -C ${GMP} check
  	make -C ${GMP} install
  	touch gmp
+ # need to reset PREFIX!
  
  gmp-clean: 
  	rm -rf ${GMP} 
***************
*** 808,814 ****
  

  	touch gmpy
  
  gmpy-clean:
--- 819,825 ----
  
  gmpy: ${GMPY}.tar.gz python gmp
  	tar -xzf ${GMPY}.tar.gz
! 	cd ${GMPY}; ${PREFIX}/bin/python setup.py build_ext --compiler=mingw32 --include-dirs='${PREFIX}/include' --library-dirs='${PREFIX}/lib'; ${PREFIX}/bin/python setup.py install ${PYSETUP_OPT}
  	touch gmpy
  
  gmpy-clean:
