The non-MakeMaker.pm parts of

Subject: [PATCH] Re: MM_Beos.pm?
Message-Id: <200201142006.WAA29544@taas.iki.fi>

p4raw-id: //depot/perl@14301

diff --git a/ext/SDBM_File/sdbm/Makefile.PL b/ext/SDBM_File/sdbm/Makefile.PL
index 4453dea..6de7bd0 100644 (file)
--- a/ext/SDBM_File/sdbm/Makefile.PL
+++ b/ext/SDBM_File/sdbm/Makefile.PL
@@ -1,6 +1,6 @@
 use ExtUtils::MakeMaker;
 
-$define = '-DSDBM -DDUFF';
+my $define = '-DSDBM -DDUFF';
 $define .= ' -DWIN32 -DPERL_STATIC_SYMS' if ($^O eq 'MSWin32');
 
 if ($^O eq 'VMS') {  # Old VAXC compiler can't handle Duff's device

diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 10d96a5..249954d 100644 (file)
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -3898,14 +3898,13 @@ sub xs_o {      # many makes are too dumb to use xs_c then c_o
 =item perl_archive
 
 This is internal method that returns path to libperl.a equivalent
-to be linked to dynamic extensions. UNIX does not have one but OS2
-and Win32 do.
+to be linked to dynamic extensions. UNIX does not have one but other
+OSs might have one.
 
 =cut 
 
 sub perl_archive
 {
- return '$(PERL_INC)' . "/$Config{libperl}" if $^O eq "beos";
  return "";
 }
 

diff --git a/lib/ExtUtils/t/MM_Unix.t b/lib/ExtUtils/t/MM_Unix.t
index aea777b..fec24ca 100644 (file)
--- a/lib/ExtUtils/t/MM_Unix.t
+++ b/lib/ExtUtils/t/MM_Unix.t
@@ -3,6 +3,7 @@
 # 2001-12-16 Tels first version
 # 2002-01-13 Tels 0.02 added some tests for various functions, added Andreas
 #                     fix to the version test (>= vs ==)
+# 2002-01-14 Tels 0.03 exclude on beos and netware, /i for $^O test
 
 BEGIN {
     chdir 't' if -d 't';
@@ -12,7 +13,7 @@ BEGIN {
 BEGIN { 
     use Test::More; 
 
-    if( $^O =~ /^VMS|os2|MacOS|MSWin32|cygwin$/ ) {
+    if( $^O =~ /^VMS|os2|MacOS|MSWin32|cygwin|beos|netware$/i ) {
         plan skip_all => 'Non-Unix platform';
     }
     else {