From 8bb7833dc6bbca6126d7dd755ccd4d43aea9e7fa Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 9 Sep 2006 08:17:48 +0000
Subject: r18291: don't add ./ for files in the top dir '.'

metze
(This used to be commit f60be737efc9e3d515479301a9ed24347aa773cc)
---
 source4/build/smb_build/output.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/build')

diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 6cae16e886..7f643e01c3 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -12,12 +12,16 @@ sub add_dir($$)
 {
 	my ($dir,$files) = @_;
 	my @ret = ();
+	my $dirsep = "/";
 
+	$dir =~ s/^\.$//g;
 	$dir =~ s/^\.\///g;
+
+	$dirsep = "" if ($dir eq "");
 	
 	foreach (@$files) {
 		if (substr($_, 0, 1) ne "\$") {
-			$_ = "$dir/$_";
+			$_ = "$dir$dirsep$_";
 			s/([^\/\.]+)\/\.\.\///g;
 			s/([^\/\.]+)\/\.\.\///g;
 		}
-- 
cgit