X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setup.py;h=a530ad1ba88b31e130c39c626ad8a6435ffb8c03;hb=bc7bd41556e1fd137acf4df415e5dc0f6d5e02c4;hp=e52e4b60ebe84bea51c2d0b7bdd139cc305c9218;hpb=1be54e32324eeecd228c620bdcc80e84518864a0;p=plcapi.git

diff --git a/setup.py b/setup.py
index e52e4b6..a530ad1 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
 # Setup script for PLCAPI
 #
@@ -9,16 +9,16 @@
 from distutils.core import setup
 from glob import glob
 
-setup(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']),
-        # don't package for mod_python anymore
-        (' apache', ['plc.wsgi']),
+        # 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']),
         ])