Integrate against change 9670 aka perl-5.7.1

[p5sagit/p5-mst-13.2.git] / lib / blib.pm

diff --git a/lib/blib.pm b/lib/blib.pm
index 4d8f609..0916f79 100644 (file)
--- a/lib/blib.pm
+++ b/lib/blib.pm
@@ -38,18 +38,19 @@ Nick Ing-Simmons nik@tiuk.ti.com
 
 use Cwd;
 
-warn __FILE__;
+use vars qw($VERSION);
+$VERSION = '1.00';
 
 sub import
 {
  my $package = shift;
  my $dir = getcwd;
+ if ($^O eq 'VMS') { ($dir = VMS::Filespec::unixify($dir)) =~ s-/\z--; }
  if (@_)
   {
-   print join(',',@_),"\n";
    $dir = shift;
-   $dir =~ s/blib$//;
-   $dir =~ s,/+$,,;
+   $dir =~ s/blib\z//;
+   $dir =~ s,/+\z,,;
    $dir = '.' unless ($dir);
    die "$dir is not a directory\n" unless (-d $dir);
   }
@@ -60,7 +61,7 @@ sub import
    if (-d $blib && -d "$blib/arch" && -d "$blib/lib")
     {
      unshift(@INC,"$blib/arch","$blib/lib");
-     warn "Using $blib";
+     warn "Using $blib\n";
      return;
     }
    $dir .= "/..";