summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-21 11:09:56 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-22 02:51:09 +0100
commiteffc76db100e37fb2f6824ba12a9e256aecedd48 (patch)
treeafd94bfb5e1b8dae6169486115ccd1fcc447636a
parentfecbe610282e023d998207e92854f7ffdad2f310 (diff)
downloadsamba-effc76db100e37fb2f6824ba12a9e256aecedd48.tar.gz
samba-effc76db100e37fb2f6824ba12a9e256aecedd48.tar.bz2
samba-effc76db100e37fb2f6824ba12a9e256aecedd48.zip
s3-waf: cope with location of include.h for toplevel build
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/wscript_build7
1 files changed, 6 insertions, 1 deletions
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)}')