From 6ffa7e851c2ef106a116e6e44261db6b9d343918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Borgstr=C3=B6m?= <jonas@borgstrom.se>
Date: Sat, 5 Nov 2011 21:13:15 +0100
Subject: [PATCH] Fix setuptools Cython issue

---
 fake_pyrex/Pyrex/Distutils/__init__.py  |  1 +
 fake_pyrex/Pyrex/Distutils/build_ext.py |  6 ++++++
 fake_pyrex/Pyrex/__init__.py            |  1 +
 setup.py                                | 14 +++++++++++---
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 fake_pyrex/Pyrex/Distutils/__init__.py
 create mode 100644 fake_pyrex/Pyrex/Distutils/build_ext.py
 create mode 100644 fake_pyrex/Pyrex/__init__.py

diff --git a/fake_pyrex/Pyrex/Distutils/__init__.py b/fake_pyrex/Pyrex/Distutils/__init__.py
new file mode 100644
index 000000000..c21916735
--- /dev/null
+++ b/fake_pyrex/Pyrex/Distutils/__init__.py
@@ -0,0 +1 @@
+# This is a python package
diff --git a/fake_pyrex/Pyrex/Distutils/build_ext.py b/fake_pyrex/Pyrex/Distutils/build_ext.py
new file mode 100644
index 000000000..5a184acbc
--- /dev/null
+++ b/fake_pyrex/Pyrex/Distutils/build_ext.py
@@ -0,0 +1,6 @@
+from distutils.command.build_ext import build_ext
+#
+#def build_ext(*args, **kw):
+#    from distutils import build_ext as build_ext_orig
+#    return build_ext_orig(*args, **kw)
+
diff --git a/fake_pyrex/Pyrex/__init__.py b/fake_pyrex/Pyrex/__init__.py
new file mode 100644
index 000000000..c21916735
--- /dev/null
+++ b/fake_pyrex/Pyrex/__init__.py
@@ -0,0 +1 @@
+# This is a python package
diff --git a/setup.py b/setup.py
index 9e3a82d8a..25f4ef3f7 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,13 @@
 import os
 import sys
 from glob import glob
+
+try:
+    import Cython
+    sys.path.insert(0, os.path.join(os.path.dirname(__file__), "fake_pyrex"))
+except ImportError:
+    pass
+
 from setuptools import setup, Extension
 from setuptools.command.sdist import sdist
 hashindex_sources = ['darc/hashindex.pyx', 'darc/_hashindex.c']
@@ -18,9 +25,10 @@ try:
                                         cython_compiler.default_options)
             sdist.__init__(self, *args, **kwargs)
 
-        def run(self):
-            sdist.run(self)
-            self.filelist.append('darc/hashindex.c', 'darc/hashindex.h')
+        def make_distribution(self):
+            self.filelist.append('darc/hashindex.c')
+            self.filelist.append('darc/hashindex.h')
+            sdist.make_distribution(self)
 
 except ImportError:
     hashindex_sources[0] = hashindex_sources[0].replace('.pyx', '.c')