dynconfig: added SBINDIR and BINDIR as updated dynconfig variables

[kai/samba.git] / dynconfig / wscript

diff --git a/dynconfig/wscript b/dynconfig/wscript
index e9815e0376f945dc6fafa11f318f5a2ab4e272d7..374ede27bcd023fa97b16830496ffeaa6f963287 100755 (executable)
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -340,6 +340,8 @@ def dynconfig_cflags(bld, list=None):
     override = { 'MODULESDIR'    : 'bin/modules',
                  'PYTHONDIR'     : 'bin/python',
                  'PYTHONARCHDIR' : 'bin/python',
+                 'BINDIR'        : 'bin',
+                 'SBINDIR'       : 'bin',
                  'CODEPAGEDIR'   : os.path.join(bld.env.srcdir, 'codepages'),
                  'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'),
                  'SETUPDIR'      : os.path.join(bld.env.srcdir, 'source4/setup') }
@@ -357,8 +359,6 @@ Build.BuildContext.dynconfig_cflags = dynconfig_cflags
 def build(bld):
     cflags = bld.dynconfig_cflags()
     version_header = 'version.h'
-    if not os.getenv('TOPLEVEL_BUILD'):
-        version_header = 'include/version.h'
     bld.SAMBA_SUBSYSTEM('DYNCONFIG',
                         'dynconfig.c',
                         deps='replace talloc',