From: Dave Rolsky <autarch@urth.org>
Date: Sat, 29 Dec 2001 23:16:54 +0000 (-0600)
Subject: Re: Win32 snag - File::Find File::Spec and Config.pm
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d17aa069f1b4912cd5ee512e17998985c6151513;p=p5sagit%2Fp5-mst-13.2.git

Re: Win32 snag - File::Find File::Spec and Config.pm
Message-ID: <Pine.LNX.4.43.0112292305270.16562-100000@urth.org>

$^O is NetWare, not Netware.

p4raw-id: //depot/perl@13952
---

diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index a6e56b3..684bea3 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -66,12 +66,12 @@ package ExtUtils::MakeMaker;
 #
 # Now we can pull in the friends
 #
-$Is_VMS   = $^O eq 'VMS';
-$Is_OS2   = $^O eq 'os2';
-$Is_Mac   = $^O eq 'MacOS';
-$Is_Win32 = $^O eq 'MSWin32';
-$Is_Cygwin= $^O eq 'cygwin';
-$Is_NetWare = $Config{'osname'} eq 'NetWare';
+$Is_VMS     = $^O eq 'VMS';
+$Is_OS2     = $^O eq 'os2';
+$Is_Mac     = $^O eq 'MacOS';
+$Is_Win32   = $^O eq 'MSWin32';
+$Is_Cygwin  = $^O eq 'cygwin';
+$Is_NetWare = $^O eq 'NetWare';
 
 require ExtUtils::MM_Unix;
 
@@ -86,9 +86,7 @@ if ($Is_Mac) {
     require ExtUtils::MM_MacOS;
 }
 if ($Is_NetWare) {
-	$^O = 'NetWare';
-	require ExtUtils::MM_NW5;
-	$Is_Win32=0;
+    require ExtUtils::MM_NW5;
 }
 if ($Is_Win32) {
     require ExtUtils::MM_Win32;
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
index 9d9d5b6..cf49cf6 100644
--- a/lib/File/Spec.pm
+++ b/lib/File/Spec.pm
@@ -10,18 +10,12 @@ my %module = (MacOS   => 'Mac',
 	      os2     => 'OS2',
 	      VMS     => 'VMS',
 	      epoc    => 'Epoc',
+	      NetWare => 'NW5',
 	      cygwin  => 'Cygwin');
 
 
 my $module = $module{$^O} || 'Unix';
 
-if ($^O eq 'MSWin32') {
-    require Config;
-    if ($Config::Config{osname} eq 'NetWare') {
-	$module = 'NW5';
-    }
-}
-
 require "File/Spec/$module.pm";
 @ISA = ("File::Spec::$module");