Re-merge Encode 1.92.

p4raw-id: //depot/perl@19304

diff --git a/ext/Encode/Makefile.PL b/ext/Encode/Makefile.PL
index 6e4e40c..2e74fe4 100644 (file)
--- a/ext/Encode/Makefile.PL
+++ b/ext/Encode/Makefile.PL
@@ -3,7 +3,7 @@ use ExtUtils::MakeMaker;
 
 # Just for sure :)
 unless($ENV{PERL_CORE}) {
-    $ENV{PERL_CORE} = 1 if grep { $_ eq 'PERL_CORE=1' } @ARGV;
+    $ENV{PERL_CORE} = 1 if ($^X =~ m{\bminiperl[^/\\\]>:]*$}o);
 }
 
 my %tables = 

diff --git a/ext/Encode/t/enc_module.t b/ext/Encode/t/enc_module.t
index 0910029..ac9bf3c 100644 (file)
--- a/ext/Encode/t/enc_module.t
+++ b/ext/Encode/t/enc_module.t
@@ -38,7 +38,6 @@ open STDOUT, ">", $file1 or die "$file1:$!";
 print $obj->str, "\n";
 $obj->set("¥Æ¥¹¥Èʸ»úÎó");
 print $obj->str, "\n";
-close STDOUT;
 
 my $cmp = compare_text($file0, $file1);
 is($cmp, 0, "encoding vs. STDOUT");
@@ -52,6 +51,7 @@ while(<STDIN>){
     is ($cmp[$i++], $_, "encoding vs. STDIN - $i");
 }
 
+close STDOUT;
 unlink $file1 unless $cmp;
 __END__