diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-09 08:17:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:02 -0500 |
| commit | 8bb7833dc6bbca6126d7dd755ccd4d43aea9e7fa (patch) | |
| tree | bbf73d1840054d0eb5d591fe8b48b0ea899bbce8 | |
| parent | 1caceff302203bd682bc0995feeffb1fe880de75 (diff) | |
| download | samba-8bb7833dc6bbca6126d7dd755ccd4d43aea9e7fa.tar.gz samba-8bb7833dc6bbca6126d7dd755ccd4d43aea9e7fa.tar.bz2 samba-8bb7833dc6bbca6126d7dd755ccd4d43aea9e7fa.zip | |
r18291: don't add ./ for files in the top dir '.'
metze
(This used to be commit f60be737efc9e3d515479301a9ed24347aa773cc)
| -rw-r--r-- | source4/build/smb_build/output.pm | 6 |
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; } |