summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/makefile.pm
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-05-28 12:07:20 +1000
committerAndrew Tridgell <tridge@samba.org>2008-05-28 12:07:20 +1000
commit275e057bea09c1d15228963a5b5650df28a4b24b (patch)
treefc24aee4174815930451e86f73d1997028169a49 /source4/build/smb_build/makefile.pm
parent0dbef08a9a4ae127f4eaf80dfbbb00e000bdf866 (diff)
parent715cee3bdbabd86b7603fbb43da470bdb8c1fe9d (diff)
downloadsamba-275e057bea09c1d15228963a5b5650df28a4b24b.tar.gz
samba-275e057bea09c1d15228963a5b5650df28a4b24b.tar.bz2
samba-275e057bea09c1d15228963a5b5650df28a4b24b.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit ecb0e5477aa63180daade5c597e7ac2aebfc1e15)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
-rw-r--r--source4/build/smb_build/makefile.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0269cfe8a3..73801c25fd 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -262,6 +262,10 @@ sub CFlags($$)
if($src_ne_build) {
if($flag =~ m#^-I([^/].*$)#) {
my $dir = $1;
+ if ($dir =~ /^\$\(/) {
+ push (@cflags, $flag);
+ next;
+ }
$dir =~ s#^\$\((?:src|build)dir\)/?##;
push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
next;