X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=e2a59313afdd482682985f4496e7f2ed0f584e2c;hb=e68365ae0a76902ee71d13a154ed5035b10e8109;hp=6918ba26be26643599b0ffe84407738fd3b89d56;hpb=58330ba3df549b85471f5747b1f1bfd43e08010b;p=plcapi.git

diff --git a/setup.py b/setup.py
index 6918ba2..e2a5931 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
 # Setup script for PLCAPI
 #
@@ -6,19 +6,28 @@
 # Copyright (C) 2006 The Trustees of Princeton University
 #
 
-from distutils.core import setup
+from setuptools import setup
 from glob import glob
 
-setup(packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors', 'aspects'],
-      scripts = ['plcsh', 'Server.py'],
-      data_files = [
-        ('', ['planetlab5.sql']),
-        # don't package for mod_python anymore
-        (' apache', ['apache/plc.wsgi']),
-        ('php', ['php/plc_api.php']),
-        ('migrations', 
-         ['migrations/README.txt',
-          'migrations/extract-views.py'] 
-         + glob('migrations/[0-9][0-9][0-9]*')),
-        ('extensions', ['extensions/README.txt']),
-        ])
+setup(
+    name="plc_api",
+    packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors'],
+    scripts = ['plcsh', 'Server.py'],
+    data_files = [
+        ('',
+            ['planetlab5.sql']),
+        # package for mod_python and mod_wsgi, defer choice to myplc
+        ('apache',
+            ['apache/ModPython.py',
+             'apache/__init__.py',
+             'apache/plc.wsgi']),
+        ('php',
+            ['php/plc_api.php']),
+        ('migrations',
+            ['migrations/README.txt',
+             'migrations/extract-views.py']
+             + glob('migrations/[0-9][0-9][0-9]*')),
+        ('extensions',
+            ['extensions/README.txt']),
+    ]
+)