X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsite_init.py;h=0121a242ae47b32c03ebcfcca49ae475b504b7b2;hb=e05437de40eb79af1075c5186820d639db42e105;hp=dac80c86529e631f11523cda859e255a24c88743;hpb=4f878fb70e70b724b615b957ec55e3d853c3a61b;p=senf.git

diff --git a/site_scons/site_init.py b/site_scons/site_init.py
index dac80c8..0121a24 100644
--- a/site_scons/site_init.py
+++ b/site_scons/site_init.py
@@ -1,9 +1,12 @@
 import os.path, SCons
+import inspect
+import sys
 
 # SCons is at     #/tools/scons-<v>/engine/SCons/__init__.py
 # site_init is at #/site_scons/site_init.py
 
-sconsbase = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),"tools")
+sconsbase = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(
+    inspect.currentframe().f_code.co_filename))),"tools")
 sconsbase = os.path.join(
     sconsbase,sorted((f for f in os.listdir(sconsbase) if f.startswith("scons-")))[-1])
 sconsengine = os.path.join(sconsbase, 'engine')
@@ -43,7 +46,8 @@ if os.path.dirname(os.path.dirname(os.path.abspath(SCons.__file__))) != sconseng
     cdir = os.path.normpath(cdir)
     if cdir.startswith('../'):
         SCons.Util.display("scons: WARNING: failed to undo -C option")
-    elif cdir != '.':
+    elif cdir != '.' and not cdir.startswith('/'):
         os.chdir('/'.join(('..' for _ in cdir.split('/'))))
     os.environ['SCONS_LIB_DIR'] = sconsengine
-    os.execv(sconsscript, sys.argv)
+    os.execv(sys.executable, [sconsscript] + sys.argv)
+