From dfdabffae3c90e44b504bbbb4903b1aa30fb2f86 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 4 Apr 2010 21:14:21 +1000
Subject: build: fixed LOAD_ENVIRONMENT for out of tree builds

---
 buildtools/wafsamba/samba_utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 37b3fc9dbb..fc23aa4f64 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -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
 
 
-- 
cgit