MakeMaker sync 5.48_03 -> 5.53_01

Message-ID: <20020329091247.GA7432@blackrider>

(with two nits: (1) change lib/Extutils/Command/MM.pm
in MANIFEST to be lib/ExtUtils/Command/MM.pm (2) Add
@INC to compile.t)

p4raw-id: //depot/perl@15599

1 files changed, 20 insertions, 19 deletions

diff --git a/lib/ExtUtils/MM_OS2.pm b/lib/ExtUtils/MM_OS2.pm
index f598c71aaf..1db55c4f33 100644
--- a/lib/ExtUtils/MM_OS2.pm
+++ b/lib/ExtUtils/MM_OS2.pm
@@ -1,20 +1,16 @@
 package ExtUtils::MM_OS2;
 
 use strict;
+use vars qw($VERSION @ISA);
 
-our $VERSION = '1.00';
-
-#use Config;
-#use Cwd;
-#use File::Basename;
-require Exporter;
-
-require ExtUtils::MakeMaker;
-ExtUtils::MakeMaker->import(qw( $Verbose &neatvalue));
-
+use ExtUtils::MakeMaker qw(neatvalue);
 use File::Spec;
 
-unshift @MM::ISA, 'ExtUtils::MM_OS2';
+$VERSION = '1.02_01';
+
+require ExtUtils::MM_Any;
+require ExtUtils::MM_Unix;
+@ISA = qw(ExtUtils::MM_Any ExtUtils::MM_Unix);
 
 =pod
 
@@ -38,6 +34,17 @@ the semantics.
 
 =cut
 
+sub dist {
+    my($self, %attribs) = @_;
+
+    $attribs{TO_UNIX} ||= sprintf <<'MAKE_TEXT', $self->{NOECHO};
+%s$(TEST_F) tmp.zip && $(RM) tmp.zip; \\
+$(ZIP) -ll -mr tmp.zip $(DISTVNAME) && unzip -o tmp.zip && $(RM) tmp.zip
+MAKE_TEXT
+
+    return $self->SUPER::dist(%attribs);
+}
+
 sub dlsyms {
     my($self,%attribs) = @_;
 
@@ -111,14 +118,8 @@ sub maybe_command {
     return;
 }
 
-sub file_name_is_absolute {
-    shift;
-    return File::Spec->file_name_is_absolute(@_);
-}
-
-sub perl_archive
-{
- return "\$(PERL_INC)/libperl\$(LIB_EXT)";
+sub perl_archive {
+    return "\$(PERL_INC)/libperl\$(LIB_EXT)";
 }
 
 =item perl_archive_after