svn commit: samba r20645 - in branches/SAMBA_4_0/source/build/smb_build: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-01-10 08:50:03 +0000 (Wed, 10 Jan 2007)
New Revision: 20645

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20645

Log:
Commit the build system changes to allow scripts in config.mk files.

Andrew Bartlett

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	2007-01-10 07:56:43 UTC (rev 20644)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2007-01-10 08:50:03 UTC (rev 20645)
@@ -117,7 +117,7 @@
 ###########################################################
 # The parsing function which parses the file
 #
-# $result = _parse_config_mk($filename)
+# $result = _parse_config_mk($input, $srcdir, $builddir, $filename)
 #
 # $filename -	the path of the config.mk file
 #		which should be parsed
@@ -133,6 +133,7 @@
 
 	my $parsing_file = $filename;
 	my $retry_parsing_file = undef;
+	my $basedir;
 
 	$ENV{samba_builddir} = $builddir;
 	$ENV{samba_srcdir} = $srcdir;
@@ -157,9 +158,13 @@
 		}
 	}
 
-	push (@parsed_files, $parsing_file);
+        if ($parsing_file =~ /\|$/) { 
+	        $basedir = $builddir;
+	} else {
+	        $basedir = dirname($filename);
+		push (@parsed_files, $parsing_file);
+	}
 	
-	
 	my @lines = <CONFIG_MK>;
 	close(CONFIG_MK);
 
@@ -236,7 +241,7 @@
 		$input->{$name}{NAME} = $name;
 		$input->{$name}{TYPE} = $type;
 		$input->{$name}{MK_FILE} = $parsing_file;
-		$input->{$name}{BASEDIR} = dirname($filename);
+		$input->{$name}{BASEDIR} = $basedir;
 
 		foreach my $key (values %{$result->{$section}}) {
 			$key->{VAL} = smb_build::input::strtrim($key->{VAL});