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 <abartlet@samba.org>

diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 00580471826b57bd93610a1b0a6eccc397374f8c..ca664fbe6e586e01193f86914fd37f22ea900113 100644 (file)
--- 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