Merged revisions 4186 to 4454 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/sqlalchemy@4455 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 12 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 9c189ebf75..13ad065681 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 from distutils.core import setup
 from distutils.command.install import INSTALL_SCHEMES
 import os
+import sys
 
 # Tell distutils to put the data_files in platform-specific installation
 # locations. See here for an explanation:
@@ -23,11 +24,20 @@ for dirpath, dirnames, filenames in os.walk(django_dir):
         package = dirpath[len_root_dir:].lstrip('/').replace('/', '.')
         packages.append(package)
     else:
-        data_files.append((dirpath, [os.path.join(dirpath, f) for f in filenames]))
+        data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
+
+# Small hack for working with bdist_wininst.
+# See http://mail.python.org/pipermail/distutils-sig/2004-August/004134.html
+if sys.argv[1] == 'bdist_wininst':
+    for file_info in data_files:
+        file_info[0] = '/PURELIB/%s' % file_info[0]
+
+# Dynamically calculate the version based on django.VERSION.
+version = "%d.%d-%s" % (__import__('django').VERSION)
 
 setup(
     name = "Django",
-    version = "0.95",
+    version = version,
     url = 'http://www.djangoproject.com/',
     author = 'Lawrence Journal-World',
     author_email = 'holovaty@gmail.com',