From c6c49d8ec4ba5dce968f300ff434c3f0e21e4127 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 21 Feb 2011 11:10:35 +1100 Subject: s3-waf: make version and build directory conditional we don't need these when doing a toplevel build Pair-Programmed-With: Andrew Bartlett --- source3/wscript_build | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source3/wscript_build b/source3/wscript_build index c7bc361821..94bebb7490 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -686,12 +686,13 @@ t.env.BUILDDIR = bld.path.abspath() bld.SETUP_BUILD_GROUPS() -samba_version.load_version(bld.env) - -bld.SAMBA_MKVERSION('include/version.h') +if not bld.env.toplevel_build: + # when using a toplevel build, these are already supplied + samba_version.load_version(bld.env) + bld.SAMBA_MKVERSION('include/version.h') + bld.RECURSE('../lib/replace') + bld.RECURSE('build') -bld.RECURSE('../lib/replace') -bld.RECURSE('build') ######################## SUBSYSTEMS ################################# -- cgit