summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-27 17:16:57 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-27 17:16:57 +0200
commit7ae9cb4f79d2d10566a62fa2159a1cf2b6e0bada (patch)
tree2ddc0124135da4b101ef263a8e0500863c76ddd6
parent03f6679f866905cbd45b07552b60547238b0b88e (diff)
downloadsamba-7ae9cb4f79d2d10566a62fa2159a1cf2b6e0bada.tar.gz
samba-7ae9cb4f79d2d10566a62fa2159a1cf2b6e0bada.tar.bz2
samba-7ae9cb4f79d2d10566a62fa2159a1cf2b6e0bada.zip
Don't throw away cflags if they start with a variable.
(This used to be commit 9f81214239e1cf6563da4ed49d051fe56d3ab129)
-rw-r--r--source4/build/smb_build/makefile.pm5
-rw-r--r--source4/heimdal_build/config.mk2
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index e93e3eb767..73801c25fd 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -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;
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index ea353bcca3..8eea568ad7 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -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]