summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/build/smb_build/output.pm6
1 files changed, 5 insertions, 1 deletions
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;
}