sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

Don't throw away cflags if they start with a variable.

Browse Source 
(This used to be commit 9f81214239)
This commit is contained in:
Jelmer Vernooij 2008-05-27 17:16:57 +02:00
parent 03f6679f86
commit 7ae9cb4f79
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/build/smb_build/makefile.pm
View File

@ -262,7 +262,10 @@ sub CFlags($$)
if($src_ne_build) {
if($flag =~ m#^-I([^/].*$)#) {
my $dir = $1;
next if ($dir =~ /^\$\(/);
if ($dir =~ /^\$\(/) {
push (@cflags, $flag);
next;
}
$dir =~ s#^\$\((?:src|build)dir\)/?##;
push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
next;

2
source4/heimdal_build/config.mk
View File

@ -415,7 +415,7 @@ $(HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heim
[SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM]
HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES = $(heimdalsrcdir)/lib/roken/closefrom.o
$(HEIMDAL_ROKEN_CLOSEFROM): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir)
$(HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir)
[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_H]