summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/lib/smbreadline/smbreadline.c6
-rwxr-xr-xsource4/script/cflags.pl4
2 files changed, 6 insertions, 4 deletions
diff --git a/source4/lib/smbreadline/smbreadline.c b/source4/lib/smbreadline/smbreadline.c
index 6b8e54e1e3..a1fa5d7df3 100644
--- a/source4/lib/smbreadline/smbreadline.c
+++ b/source4/lib/smbreadline/smbreadline.c
@@ -21,9 +21,9 @@
#include "includes.h"
#include "pstring.h"
-#include "lib/replace/system/filesys.h"
-#include "lib/replace/system/select.h"
-#include "lib/replace/system/readline.h"
+#include "system/filesys.h"
+#include "system/select.h"
+#include "system/readline.h"
/*******************************************************************
Similar to sys_select() but catch EINTR and continue.
diff --git a/source4/script/cflags.pl b/source4/script/cflags.pl
index 7ca8f12404..f98ed9f611 100755
--- a/source4/script/cflags.pl
+++ b/source4/script/cflags.pl
@@ -7,13 +7,15 @@
use strict;
my $target = shift;
+my $target2 = "./$target";
sub check_flags($)
{
my ($name)=@_;
open (IN, "extra_cflags.txt");
while (<IN> =~ /^([^:]+): (.*)$/) {
- next unless (grep(/^$target$/, (split / /, $1)));
+ next unless (grep(/^$target$/, (split / /, $1)) ||
+ grep(/^$target2$/, (split / /, $1)));
$_ = $2;
s/^CFLAGS\+=//;
print "$_ ";