Disable installing PYO and PYC. Fix install paths.

Installing PYO and PYC does not work so disable this. Move the
Python check to the top level and have a single place.

Fix the install paths a revert the 'from . import' changes. This
is resolved by installing into the correct paths.

8 files changed, 23 insertions, 19 deletions

diff --git a/rtemstoolkit/config.py b/rtemstoolkit/config.py
index 70cd05f..ee7cb1c 100644
--- a/rtemstoolkit/config.py
+++ b/rtemstoolkit/config.py
@@ -41,6 +41,12 @@ import os
 import re
 import sys
 
+import error
+import execute
+import log
+import options
+import path
+
 try:
     import error
     import execute
diff --git a/rtemstoolkit/execute.py b/rtemstoolkit/execute.py
index 4125182..3f8e3e6 100755
--- a/rtemstoolkit/execute.py
+++ b/rtemstoolkit/execute.py
@@ -41,8 +41,8 @@ import subprocess
 import threading
 import time
 
-from . import error
-from . import log
+import error
+import log
 
 # Trace exceptions
 trace_threads = False
diff --git a/rtemstoolkit/git.py b/rtemstoolkit/git.py
index 3ba5f7a..20a1aa6 100644
--- a/rtemstoolkit/git.py
+++ b/rtemstoolkit/git.py
@@ -31,11 +31,11 @@
 
 import os
 
-from . import error
-from . import execute
-from . import log
-from . import options
-from . import path
+import error
+import execute
+import log
+import options
+import path
 
 class repo:
     """An object to manage a git repo."""
diff --git a/rtemstoolkit/log.py b/rtemstoolkit/log.py
index 1af914d..1308203 100755
--- a/rtemstoolkit/log.py
+++ b/rtemstoolkit/log.py
@@ -36,7 +36,7 @@ import os
 import sys
 import threading
 
-from . import error
+import error
 
 #
 # A global log.
diff --git a/rtemstoolkit/macros.py b/rtemstoolkit/macros.py
index 5440e5c..632be87 100644
--- a/rtemstoolkit/macros.py
+++ b/rtemstoolkit/macros.py
@@ -38,8 +38,8 @@ import re
 import os
 import string
 
-from . import error
-from . import path
+import error
+import path
 
 #
 # Macro tables
diff --git a/rtemstoolkit/path.py b/rtemstoolkit/path.py
index a767b41..df51005 100644
--- a/rtemstoolkit/path.py
+++ b/rtemstoolkit/path.py
@@ -39,8 +39,8 @@ import os
 import shutil
 import string
 
-from . import error
-from . import log
+import error
+import log
 
 windows = os.name == 'nt'
 
diff --git a/rtemstoolkit/version.py b/rtemstoolkit/version.py
index 139078c..f8b8a7b 100644
--- a/rtemstoolkit/version.py
+++ b/rtemstoolkit/version.py
@@ -35,8 +35,8 @@
 
 import sys
 
-from . import error
-from . import path
+import error
+import path
 
 #
 # Default to an internal string.
@@ -67,6 +67,7 @@ def _load_released_version():
     return _released
 
 def _load_git_version():
+    import git
     global _git
     global _version_str
     repo = git.repo(_at())
diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript
index 4b31471..c7cea36 100644
--- a/rtemstoolkit/wscript
+++ b/rtemstoolkit/wscript
@@ -51,14 +51,11 @@ def configure(conf):
 
     conf.find_program('m4')
 
-    conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
-    conf.check_cc(function_name='kill', header_name="signal.h",
+    conf.check(header_name = 'sys/wait.h',  features = 'c', mandatory = False)
+    conf.check_cc(function_name = 'kill', header_name="signal.h",
                   features = 'c', mandatory = False)
     conf.write_config_header('config.h')
 
-    conf.load('python')
-    conf.check_python_version((2,6,6))
-
 def build(bld):
     #
     # The local configuration.