FIX: conflict in settings.py

[myslice.git] / setup.py

diff --git a/setup.py b/setup.py
index 2eeb598..8783260 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ import os.path
 from glob import glob
 from distutils.core import setup
 
-# we don't have a final list os let's keep it simple for now
+# we don't have a final list so let's keep it simple for now
 packages= [ os.path.dirname(init) for init in (glob("*/__init__.py")+glob("*/*/__init__.py")) ]
 
 setup(packages = packages,
@@ -19,4 +19,5 @@ setup(packages = packages,
         ( 'all-static/css', glob ('all-static/css/*')),
         ( 'all-static/img', glob ('all-static/img/*')),
         ( 'all-templates', glob ('all-templates/*')),
+        ( 'apache', [ 'apache/myslice.conf', 'apache/myslice.wsgi' ]),
         ])