X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fblib.pm;h=98f1612da5124ede1bb093263a90175fcc3c4d6e;hb=dfa4e5d386dd8c5329351699b02085856cdd140e;hp=6a1cf350a94e19df8244096df6137a836bfc4b30;hpb=3c4b39bee8832007b7e91bfce8701d34cacab411;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/blib.pm b/lib/blib.pm
index 6a1cf35..98f1612 100644
--- a/lib/blib.pm
+++ b/lib/blib.pm
@@ -40,13 +40,24 @@ use Cwd;
 use File::Spec;
 
 use vars qw($VERSION $Verbose);
-$VERSION = '1.02';
+$VERSION = '1.03';
 $Verbose = 0;
 
 sub import
 {
  my $package = shift;
- my $dir = getcwd;
+ my $dir;
+ if ($^O eq "MSWin32" && -f "Win32.xs") {
+     # We don't use getcwd() on Windows because it will internally
+     # call Win32::GetCwd(), which will get the Win32 module loaded.
+     # That means that it would not be possible to run `make test`
+     # for the Win32 module because blib.pm would always load the
+     # installed version before @INC gets updated with the blib path.
+     chomp($dir = `cd`);
+ }
+ else {
+     $dir = getcwd;
+ }
  if ($^O eq 'VMS') { ($dir = VMS::Filespec::unixify($dir)) =~ s-/\z--; }
  if (@_)
   {