From e04ad03d66329a45d9855b4e65ea62acceb6ecb8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 9 Sep 2006 08:46:25 +0000
Subject: r18293: use the correct name it's not always under $srcdir...

metze
(This used to be commit cf61435b435b7995f20e07b93002e51fe4ac2c82)
---
 source4/build/smb_build/config_mk.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/build/smb_build/config_mk.pm')

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 4b2a3ff8c7..5c5c0ad92b 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -201,7 +201,7 @@ sub run_config_mk($$$$)
 			next;
 		}
 
-		die("$srcdir."/".$filename:$linenum: Bad line while parsing $srcdir."/".$filename");
+		die("$parsing_file:$linenum: Bad line while parsing $parsing_file");
 	}
 
 	foreach my $section (keys %{$result}) {
@@ -209,19 +209,19 @@ sub run_config_mk($$$$)
 
 		my $sectype = $section_types->{$type};
 		if (not defined($sectype)) {
-			die($srcdir."/".$filename.":[".$section."] unknown section type \"".$type."\"!");
+			die($parsing_file.":[".$section."] unknown section type \"".$type."\"!");
 		}
 
 		$input->{$name}{NAME} = $name;
 		$input->{$name}{TYPE} = $type;
-		$input->{$name}{MK_FILE} = $srcdir."/".$filename;
+		$input->{$name}{MK_FILE} = $parsing_file;
 		$input->{$name}{BASEDIR} = dirname($filename);
 
 		foreach my $key (values %{$result->{$section}}) {
 			$key->{VAL} = smb_build::input::strtrim($key->{VAL});
 			my $vartype = $sectype->{$key->{KEY}};
 			if (not defined($vartype)) {
-				die($srcdir."/".$filename.":[".$section."]: unknown attribute type \"$key->{KEY}\"!");
+				die($parsing_file.":[".$section."]: unknown attribute type \"$key->{KEY}\"!");
 			}
 			if ($vartype eq "string") {
 				$input->{$name}{$key->{KEY}} = $key->{VAL};
-- 
cgit