build: fixed LOAD_ENVIRONMENT for out of tree builds
authorAndrew Tridgell <tridge@samba.org>
Sun, 4 Apr 2010 11:14:21 +0000 (21:14 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 6 Apr 2010 10:27:26 +0000 (20:27 +1000)
buildtools/wafsamba/samba_utils.py

index 37b3fc9dbbc9041b9d054479b715030caf3c5506..fc23aa4f64b8e8954f9c1f8090e3df0e0e1822eb 100644 (file)
@@ -396,7 +396,8 @@ def LOAD_ENVIRONMENT():
        from new commands'''
     import Environment
     env = Environment.Environment()
-    env.load('bin/c4che/default.cache.py')
+    env.load('.lock-wscript')
+    env.load(env.blddir + '/c4che/default.cache.py')
     return env