summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/main.pl
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-04-02 17:11:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:43 -0500
commit3e0f5d70709b30f4394c6539388d42168b7bbd51 (patch)
tree058e5fa29672a1576db539fd9ba9e445a87ad4c2 /source4/build/smb_build/main.pl
parent7dc8e67f81d97efb297ce37896bb996f6d133f08 (diff)
downloadsamba-3e0f5d70709b30f4394c6539388d42168b7bbd51.tar.gz
samba-3e0f5d70709b30f4394c6539388d42168b7bbd51.tar.bz2
samba-3e0f5d70709b30f4394c6539388d42168b7bbd51.zip
r22031: Make sure we rewrite the include directives in CFLAGS to contain
paths from builddir and srcdir. builddir has precedence. (This used to be commit af87c22ecf357c3e83b46cf38acec5b94686d3e9)
Diffstat (limited to 'source4/build/smb_build/main.pl')
-rw-r--r--source4/build/smb_build/main.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 765944cae1..90d99668dd 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -71,7 +71,9 @@ foreach my $key (values %$OUTPUT) {
$mkenv->write("Makefile");
header::create_smb_build_h($OUTPUT, "include/build.h");
-cflags::create_cflags($OUTPUT, "extra_cflags.txt");
+cflags::create_cflags($OUTPUT, $config::config{srcdir},
+ $config::config{builddir}, "extra_cflags.txt");
+
summary::show($OUTPUT, \%config::config);