X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=a530ad1ba88b31e130c39c626ad8a6435ffb8c03;hb=refs%2Fheads%2Fpython3;hp=f0846cf85e3908a4d04e12b6e8fc35a6ba98de4a;hpb=88cae0b8c15eb7f893682c8b63c845a2fc5969da;p=plcapi.git

diff --git a/setup.py b/setup.py
index f0846cf..a530ad1 100755
--- a/setup.py
+++ b/setup.py
@@ -1,26 +1,24 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
 # Setup script for PLCAPI
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
 
 from distutils.core import setup
 from glob import glob
 
-setup(py_modules = ['ModPython'],
-      packages = ['PLC', 'PLC/Methods', 'PLC/Methods/system', 'PLC/Accessors', 'aspects'],
+setup(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',
          ['migrations/README.txt',
-          'migrations/extract-views.py'] 
+          'migrations/extract-views.py']
          + glob('migrations/[0-9][0-9][0-9]*')),
         ('extensions', ['extensions/README.txt']),
         ])