git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fecbe61
)
s3-waf: cope with location of include.h for toplevel build
author
Andrew Tridgell
<tridge@samba.org>
Mon, 21 Feb 2011 00:09:56 +0000
(11:09 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Tue, 22 Feb 2011 01:51:09 +0000
(
02:51
+0100)
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
source3/wscript_build
patch
|
blob
|
history
diff --git
a/source3/wscript_build
b/source3/wscript_build
index 0ff2593d3c51cb282af475c978bdb951dfbbb535..c7bc36182175baf835e4f80f089b697fee0590e6 100644
(file)
--- 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)}')