diff options
| -rw-r--r-- | lib/ExtUtils/MakeMaker.pm | 16 | ||||
| -rw-r--r-- | lib/File/Spec.pm | 8 |
2 files changed, 8 insertions, 16 deletions
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm index a6e56b3ab3..684bea30fe 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 9d9d5b676e..cf49cf6b67 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"); |