From effc76db100e37fb2f6824ba12a9e256aecedd48 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 21 Feb 2011 11:09:56 +1100 Subject: s3-waf: cope with location of include.h for toplevel build Pair-Programmed-With: Andrew Bartlett --- source3/wscript_build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source3/wscript_build b/source3/wscript_build index 0ff2593d3c..c7bc361821 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -665,8 +665,13 @@ SPLIT_TOKENS_SRC = 'utils/split_tokens.c' LIBS='ICONV' +if bld.env.toplevel_build: + config_h = "../include/config.h" +else: + config_h = "include/config.h" + bld.SAMBA_GENERATOR('build_options', - source='include/config.h script/mkbuildoptions-waf.awk', + source= config_h + ' script/mkbuildoptions-waf.awk', target='smbd/build_options.c', rule='${AWK} -f ${SRC[1].abspath(env)} > ${TGT} < ${SRC[0].abspath(env)}') -- cgit