merge from 0.9.6.6

Demos/Setup.py

@@ -7,7 +7,9 @@ setup(
   ext_modules=[ 
     Extension("primes",       ["primes.pyx"]),
     Extension("spam",         ["spam.pyx"]),
-    Extension("numeric_demo", ["numeric_demo.pyx"]),
+#    Extension("numeric_demo", ["numeric_demo.pyx"]),
+    Extension("test", ["test.pyx"]),
     ],
-  cmdclass = {'build_ext': build_ext}
+  cmdclass = {'build_ext': build_ext},
+#  include_dirs = "/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/"
 )

Makefile

-VERSION = 0.9.6
+VERSION = 0.9.6.3
 
 version:
 	@echo "Setting version to $(VERSION)"

setup.py

 from distutils.core import setup
 from distutils.sysconfig import get_python_lib
 import os, sys
+import sys
 from Cython.Compiler.Version import version
 
+compiler_dir = os.path.join(get_python_lib(prefix=''), 'Cython/Compiler')
+if sys.platform == "win32":
+    compiler_dir = compiler_dir[len(sys.prefix)+1:]
+
 setup_args = {}
 
 if sys.version_info < (2,4):