From 479a4235e370325167d1085c11698f768f6b51fc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2011 17:34:51 +1100 Subject: s4-dynconfig: fixed dyn_SETUPDIR to point to the right directory this make dyn_SETUPDIR correct for both source4/ build and a top level build Pair-Programmed-With: Andrew Bartlett --- source4/dynconfig/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/dynconfig/wscript') diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 0058047182..ca664fbe6e 100644 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -124,8 +124,8 @@ def dynconfig_cflags(bld, list=None): cflags = [] # override some paths when running from the build directory override = { 'MODULESDIR' : 'bin/modules', - 'SCRIPTSBINDIR' : 'scripting/bin', - 'SETUPDIR' : 'setup' } + '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(): if list and not f in list: continue -- cgit