X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsite_init.py;h=07ffa2501435b3db9d96343c3c48fbea7c246d24;hb=84bd150c667e693c7ba6c31819b3f155f53e514a;hp=1a41a756e9a9b6436ddcd7970e544b672407d932;hpb=4b94735961fc9474411a1ca200c3a00f744ec3f1;p=senf.git

diff --git a/site_scons/site_init.py b/site_scons/site_init.py
index 1a41a75..07ffa25 100644
--- a/site_scons/site_init.py
+++ b/site_scons/site_init.py
@@ -1,14 +1,15 @@
 import os.path, SCons
 
-# SCons is at     #/scons/scons-<v>/engine/SCons/__init__.py
+# 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(__file__)),"scons")
-sconsbase = os.path.abspath(os.path.join(sconsbase, sorted(os.listdir(sconsbase))[-1]))
+sconsbase = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),"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')
-sconsscript = os.path.join(os.path.join(sconsbase, 'script'),'scons')
+sconsscript = os.path.join(sconsbase, 'script', 'scons')
 
-if os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(SCons.__file__)))) != sconsbase:
+if os.path.dirname(os.path.dirname(os.path.abspath(SCons.__file__))) != sconsengine:
     import os, sys, SCons.Util
     SCons.Util.display("scons: Switching version")