Merge branch 'thgeneric' into senslab2

[sfa.git] / setup.py

diff --git a/setup.py b/setup.py
index 61c087e..6e021ab 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -12,8 +12,8 @@ from distutils.core import setup
 bins = [ 
     'config/sfa-config-tty',
     'config/gen-sfa-cm-config.py',
-    'sfa/plc/sfa-import-plc.py', 
-    'sfa/plc/sfa-nuke-plc.py', 
+    'sfa/importer/sfa-import-plc.py', 
+    'sfa/importer/sfa-nuke-plc.py', 
     'sfa/server/sfa-ca.py', 
     'sfa/server/sfa-start.py', 
     'sfa/server/sfa-clean-peer-records.py', 
@@ -44,7 +44,9 @@ package_dirs = [
     'sfa/generic',
     'sfa/managers',
     'sfa/managers/vini',
+    'sfa/importer',
     'sfa/plc',
+    'sfa/senslab',
     'sfa/rspecs',
     'sfa/rspecs/elements',
     'sfa/rspecs/elements/versions',
@@ -60,6 +62,7 @@ data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
                               'config/default_config.xml',
                               'config/sfi_config',
+                              'config/topology',
                               'sfa/managers/pl/pl.rng',
                               'sfa/trust/credential.xsd',
                               'sfa/trust/top.xsd',