correct placement in build script

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

build

@@ -89,8 +89,13 @@ case "$1" in
     ;;
 
     pypi)
-        $0 very-clean
-        $0 man
+        #$0 very-clean
+        #$0 man
+        $0 version-dist
+        $0 sdist
+        $0 version-dynamic
+    ;;
+    sdist)
         python3 setup.py sdist
     ;;
 
@@ -159,7 +164,6 @@ case "$1" in
 
     test)
         shift # skip t
-        export PYTHONPATH=$PYTHONPATH:$(pwd -P)/lib
 
         if [ $# -lt 1 ]; then
             python3 -m cdist.test
@@ -168,6 +172,18 @@ case "$1" in
         fi
     ;;
 
+    version-dynamic)
+        cd cdist/
+        ln -sf version_dynamic.py version.py
+    ;;
+
+    version-dist)
+        version=$(cat .version)
+        cd cdist/
+        echo "VERSION=\"$version\"" > version_static.py
+        ln -sf version_static.py version.py
+    ;;
+
     *)
         echo ''
         echo 'Welcome to cdist!'
@@ -183,15 +199,4 @@ case "$1" in
         exit 1
     ;;
 
-    version-dynamic)
-        cd lib/cdist/
-        ln -sf version_dynamic.py version.py
-    ;;
-
-    version-dist)
-        version=$(cat .version)
-        cd lib/cdist/
-        echo "VERSION=\"$version\"" > version_static.py
-        ln -sf version_static.py version.py
-    ;;
 esac

setup.py

@@ -1,9 +1,14 @@
 from distutils.core import setup
 
+package_dir = {'': 'lib'}
+
+import cdist
+
 setup(
     name = "cdist",
-    packages = ["cdist"],
-    version = "2.1.0",
+    packages = ["cdist", "cdist.core", "cdist.exec", "cdist.util" ],
+    scripts = ["cdist.py"],
+    version = cdist.version.VERSION,
     description = "Usable configuration management system",
     author = "Nico Schottelius",
     author_email = "nico-cdist-pypi@schottelius.org",