diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-05 18:27:33 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:01 +1100 |
| commit | 19c3546872216980ff49e5b3dbffb01433c07552 (patch) | |
| tree | d51e1a219ac0f1627b4de3b1865d7f611e32278b | |
| parent | d1e5a7380619043a351ba8a25ebb8031163e70b7 (diff) | |
| download | samba-19c3546872216980ff49e5b3dbffb01433c07552.tar.gz samba-19c3546872216980ff49e5b3dbffb01433c07552.tar.bz2 samba-19c3546872216980ff49e5b3dbffb01433c07552.zip | |
s4-waf Add PYTHONDIR and PYTHONARCHDIR to the 'different on install' list
This allows the C code to rely on PYTHONDIR and PYTHONARCHDIR to
always be correct, and so not to cause problems when forcing these
into sys.path.
Andrew Bartlett
| -rw-r--r-- | source4/dynconfig/wscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 0c5cf079d6..08621d40f1 100644 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -124,6 +124,8 @@ def dynconfig_cflags(bld, list=None): cflags = [] # override some paths when running from the build directory override = { 'MODULESDIR' : 'bin/modules', + 'PYTHONDIR' : 'bin/python', + 'PYTHONARCHDIR' : 'bin/python', 'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'), 'SETUPDIR' : os.path.join(bld.env.srcdir, 'source4/setup') } for f in dyn_cflags.keys(): |