svn commit: samba r18294 - in
branches/SAMBA_4_0/source/build/smb_build: .
metze at samba.org
metze at samba.org
Sat Sep 9 09:05:40 GMT 2006
Author: metze
Date: 2006-09-09 09:05:39 +0000 (Sat, 09 Sep 2006)
New Revision: 18294
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18294
Log:
remove leading ././ from .mk files
metze
Modified:
branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-09-09 08:46:25 UTC (rev 18293)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-09-09 09:05:39 UTC (rev 18294)
@@ -130,17 +130,32 @@
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 @@
# 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;
}
More information about the samba-cvs
mailing list