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

(This used to be commit 9f81214239e1cf6563da4ed49d051fe56d3ab129)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index e93e3eb767a7c36c55cc229ef29522d95b00ad25..73801c25fd3afdd1e294cfe3c52895cd71e1f0cf 100644 (file)
--- 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 ea353bcca389183505b773a95bb32c5cb17a92f5..8eea568ad7b3d194479f2ef812f978d693700d97 100644 (file)
--- 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]