sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

r18294: remove leading ././ from .mk files

Browse Source 
metze
(This used to be commit f41e2f7f5a71d22ae6b27ac9fb0239512728e12c)
This commit is contained in:
Stefan Metzmacher 2006-09-09 09:05:39 +00:00 committed by Gerald (Jerry) Carter
parent e04ad03d66
commit 1a7ad8e573
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source4/build/smb_build/config_mk.pm
View File

@ -130,17 +130,32 @@ sub run_config_mk($$$$)
my $section = "GLOBAL";
my $makefile = "";
my $parsing_file = $builddir."/".$filename;
my $parsing_file = $filename;
my $retry_parsing_file = undef;
$ENV{samba_builddir} = $builddir;
$ENV{samba_srcdir} = $srcdir;
if (!open(CONFIG_MK, $parsing_file)) {
$parsing_file = $srcdir."/".$filename;
open(CONFIG_MK, $parsing_file) or
die("Can't open neither `$builddir."/".$filename' nor `$srcdir/$filename'\n");
if (($srcdir ne ".") or ($builddir ne ".")) {
$parsing_file = $builddir."/".$filename;
$retry_parsing_file = $srcdir."/".$filename;
}
if (open(CONFIG_MK, $parsing_file)) {
$retry_parsing_file = undef;
} else {
die("Can't open $parsing_file") unless defined($retry_parsing_file);
}
if (defined($retry_parsing_file)) {
if (open(CONFIG_MK, $parsing_file)) {
$parsing_file = $retry_parsing_file;
$retry_parsing_file = undef;
} else {
die("Can't open neither '$parsing_file' nor '$retry_parsing_file'\n");
}
}
push (@parsed_files, $parsing_file);
@ -173,7 +188,12 @@ sub run_config_mk($$$$)
# include
if ($line =~ /^include (.*)$/) {
$makefile .= run_config_mk($input, $srcdir, $builddir, dirname($filename)."/$1");
my $subfile= $1;
my $subdir = dirname($filename);
$subdir =~ s/^\.$//g;
$subdir =~ s/^\.\///g;
$subdir .= "/" if ($subdir ne "");
$makefile .= run_config_mk($input, $srcdir, $builddir, $subdir.$subfile);
next;
}