From: Gurusamy Sarathy <gsar@cpan.org>
Date: Wed, 28 Oct 1998 21:51:11 +0000 (+0000)
Subject: MM patches from Ilya Zakharevich
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6071deed1123166fa8c7c5412c9f7b669e8f7139;p=p5sagit%2Fp5-mst-13.2.git

MM patches from Ilya Zakharevich
	Date: Wed, 28 Oct 1998 01:27:04 -0500 (EST)
	Message-Id: <199810280627.BAA07053@monk.mps.ohio-state.edu>
	Subject: [PATCH 5.00552] Make MakeMaker more verbose
	--
	Date: Wed, 28 Oct 1998 01:25:36 -0500 (EST)
	Message-Id: <199810280625.BAA06980@monk.mps.ohio-state.edu>
	Subject: [PATCH 5.00552] Make MakeMaker ignore errors in kid Makefile.PL

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

diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 47c3daa..51fb62e 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -416,6 +416,7 @@ sub ExtUtils::MakeMaker::new {
     }
 
     my $newclass = ++$PACKNAME;
+    local @Parent = @Parent;	# Protect against non-local exits
     {
 #	no strict;
 	print "Blessing Object into class [$newclass]\n" if $Verbose>=2;
@@ -475,6 +476,9 @@ END
 
     $self->init_dirscan();
     $self->init_others();
+    my($argv) = neatvalue(\@ARGV);
+    $argv =~ s/^\[/(/;
+    $argv =~ s/\]$/)/;
 
     push @{$self->{RESULT}}, <<END;
 # This Makefile is for the $self->{NAME} extension to perl.
@@ -485,6 +489,8 @@ END
 #
 #	ANY CHANGES MADE HERE WILL BE LOST!
 #
+#   MakeMaker ARGV: $argv
+#
 #   MakeMaker Parameters:
 END
 
@@ -529,7 +535,6 @@ END
     }
 
     push @{$self->{RESULT}}, "\n# End.";
-    pop @Parent;
 
     $self;
 }