From 19c3546872216980ff49e5b3dbffb01433c07552 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 5 Feb 2011 18:27:33 +1100 Subject: 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 --- source4/dynconfig/wscript | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/dynconfig') 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(): -- cgit