--- a/src/ldt/setup.py	Thu Sep 29 12:54:55 2011 +0200
+++ b/src/ldt/setup.py	Fri Sep 30 03:15:11 2011 +0200
@@ -1,22 +1,42 @@
 import os
-
-from distribute_setup import use_setuptools
-use_setuptools()
+from distutils.core import setup
+from distutils.command.install_data import install_data
+from distutils.command.install import INSTALL_SCHEMES
+import sys
 
-from setuptools import setup
+class osx_install_data(install_data):
+    # On MacOS, the platform-specific lib dir is /System/Library/Framework/Python/.../
+    # which is wrong. Python 2.5 supplied with MacOS 10.5 has an Apple-specific fix
+    # for this in distutils.command.install_data#306. It fixes install_lib but not
+    # install_data, which is why we roll our own install_data class.
+    
+    def finalize_options(self):
+        # By the time finalize_options is called, install.install_lib is set to the
+        # fixed directory, so we set the installdir to install_lib. The
+        # install_data class uses ('install_data', 'install_dir') instead.
+        self.set_undefined_options('install', ('install_lib', 'install_dir'))
+        install_data.finalize_options(self)
 
-ROOT_DIR = os.path.dirname(__file__)
-SOURCE_DIR = os.path.join(ROOT_DIR, 'ldt')
+if sys.platform == "darwin": 
+    cmdclasses = {'install_data': osx_install_data} 
+else: 
+    cmdclasses = {'install_data': install_data} 
+
+
+root_dir = os.path.dirname(__file__)
+if root_dir != '':
+    os.chdir(root_dir)
+source_dir = 'ldt'
 
 version_variables = {}
 try:
-    execfile(os.path.join(SOURCE_DIR, "__init__.py"), version_variables)
+    execfile(os.path.join(source_dir, "__init__.py"), version_variables)
 except:
     pass
 
 version = version_variables['__version__']
 
-def full_split(path, result=None):
+def fullsplit(path, result=None):
     """
     Split a pathname into components (the opposite of os.path.join) in a
     platform-neutral way.
@@ -28,54 +48,59 @@
         return [tail] + result
     if head == path:
         return result
-    return full_split(head, [tail] + result)
+    return fullsplit(head, [tail] + result)
 
-packages, data_files, path_processed = [], {}, []
-
-#TODO : uses find_packages form setuptools and teh mercurial extension
+packages, data_files = [], []
 
-for dirpath, dirnames, filenames in os.walk(SOURCE_DIR, True):
+
+for dirpath, dirnames, filenames in os.walk(source_dir):
     # Ignore dirnames that start with '.'
-    if dirpath in path_processed:
-        continue
-    path_processed.append(dirpath)
     for i, dirname in enumerate(dirnames):
         if dirname.startswith('.'): del dirnames[i]
     if '__init__.py' in filenames:
-        packages.append('.'.join(full_split(dirpath)))
-    else:
-        new_data_files = []
-        base_path_list = full_split(dirpath)[:-1]
-        base_path = "/".join(base_path_list) + "/"
-        key = '.'.join(base_path_list)
-        for ldirpath, ldirnames, lfilenames in os.walk(dirpath):
-            path_processed.append(ldirpath)
-            new_data_files.extend([os.path.join(ldirpath[len(base_path):], f) for f in lfilenames])
-        data_files.setdefault(key, []).extend(new_data_files)
+        packages.append('.'.join(fullsplit(dirpath)))
+    elif filenames:
+        data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
+
+
+# Tell distutils to put the data_files in platform-specific installation
+# locations. See here for an explanation:
+# http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
+for scheme in INSTALL_SCHEMES.values():
+    scheme['data'] = scheme['purelib']
+
+# Small hack for working with bdist_wininst.
+# See http://mail.python.org/pipermail/distutils-sig/2004-August/004134.html
+if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
+    for file_info in data_files:
+        file_info[0] = '\\PURELIB\\%s' % file_info[0]
 
 #write MANIFEST.in
 
-m = open("MANIFEST.in", "w")
+with open("MANIFEST.in", "w") as m:    
+    m.write("include CHANGES\n")
+    m.write("include LICENSE\n")
+    m.write("include README\n")
+    m.write("include MANIFEST.in\n")
+    for entry in data_files:
+        file_list = entry[1]
+        for filename in file_list:
+            m.write("include %s\n" % (filename))
 
-m.write("exclude MANIFEST.in\n")
-for key, file_list in data_files.iteritems():
-    for filename in file_list:
-        m.write("include %s/%s\n" % (key.replace(".", "/"), filename))
-m.close()
 
 setup(
     name='ldt',
     version=version,
-    author='Yves-Marie Haussonne (IRI)',
+    author='IRI',
     author_email='contact@iri.centrepompidou.fr',
     packages=packages,
-    package_data=data_files,
+    data_files=data_files,
+    cmdclass = cmdclasses,
     scripts=[],
-    url='https://www.iri.centrepompidou.fr/dev/hg/platform',
+    url='http://www.iri.centrepompidou.fr/dev/hg/platform',
     license='LICENSE.txt',
     description='Platform ldt',
-    long_description=open('README.txt').read(),
-    zip_safe=False,
+    long_description=open('README').read(),
     classifiers=['Development Status :: 5 - Production/Stable',
                    'Environment :: Web Environment',
                    'Framework :: Django',
@@ -83,5 +108,6 @@
                    'License :: Ceccil-C',
                    'Operating System :: OS Independent',
                    'Programming Language :: Python',
-                   'Topic :: Utilities'],
+                   'Topic :: Utilities',
+    ],
 )