merging the nepi-3.0-pre-release branch with nepi-3-dev

[nepi.git] / setup.py

diff --git a/setup.py b/setup.py
index 407e842..aa9bfc6 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -24,10 +24,11 @@ setup(
             "nepi.resources.ns3",
             "nepi.resources.omf",
             "nepi.resources.planetlab",
+            "nepi.resources.planetlab.openvswitch",
             "nepi.util"],
         package_dir = {"": "src"},
         package_data = {
             "nepi.resources.planetlab" : [ "scripts/*.py" ],
-            "nepi.resources.all" : [ "scripts/*.py" ]
+            "nepi.resources.linux" : [ "scripts/*.py" ]
             }
     )