diff options
author | Andrew Tridgell <tridge@samba.org> | 2010-04-04 21:14:21 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:26 +1000 |
commit | dfdabffae3c90e44b504bbbb4903b1aa30fb2f86 (patch) | |
tree | f4dfaaf101bd3e7a783c47ed9971bf651f0989c7 | |
parent | ccfce0bbaef43b796846e2dfc8bce8f28e96fcf0 (diff) | |
download | samba-dfdabffae3c90e44b504bbbb4903b1aa30fb2f86.tar.gz samba-dfdabffae3c90e44b504bbbb4903b1aa30fb2f86.tar.bz2 samba-dfdabffae3c90e44b504bbbb4903b1aa30fb2f86.zip |
build: fixed LOAD_ENVIRONMENT for out of tree builds
-rw-r--r-- | buildtools/wafsamba/samba_utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |