summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-27 14:46:09 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-27 14:46:09 +0200
commit93a0f37f6ead117c5bdb2aa31d74c97c6e227e10 (patch)
treeb7a015299afd271c13ae3fe7af405c3f66f490ad /source4
parentb7a414138282124aaa543a2305bc6b26bbacdf5c (diff)
downloadsamba-93a0f37f6ead117c5bdb2aa31d74c97c6e227e10.tar.gz
samba-93a0f37f6ead117c5bdb2aa31d74c97c6e227e10.tar.bz2
samba-93a0f37f6ead117c5bdb2aa31d74c97c6e227e10.zip
Disable CFLAGS hack when include path starts with variable.
(This used to be commit 86ce8bf88acf3f9f9966ccf063bbf46d134ea4ba)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0269cfe8a3..e93e3eb767 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -262,6 +262,7 @@ sub CFlags($$)
if($src_ne_build) {
if($flag =~ m#^-I([^/].*$)#) {
my $dir = $1;
+ next if ($dir =~ /^\$\(/);
$dir =~ s#^\$\((?:src|build)dir\)/?##;
push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
next;