enc2xs template -- searches script more sensibly

Message-Id: <544C1568-5EB5-11D6-8F1D-00039301D480@dan.co.jp>

p4raw-id: //depot/perl@16380

diff --git a/ext/Encode/Encode/Makefile_PL.e2x b/ext/Encode/Encode/Makefile_PL.e2x
index c55b6e3..78cf91b 100644 (file)
--- a/ext/Encode/Encode/Makefile_PL.e2x
+++ b/ext/Encode/Encode/Makefile_PL.e2x
@@ -6,6 +6,7 @@
 use 5.7.2;
 use strict;
 use ExtUtils::MakeMaker;
+use Config;
 
 # Please edit the following to the taste!
 my $name = '$_Name_';
@@ -17,7 +18,8 @@ my %tables = (
 require File::Spec;
 my ($enc2xs, $encode_h) = ();
 PATHLOOP:
-for my $d (split /:/, $ENV{PATH}){
+for my $d (@Config{qw/bin sitebin vendorbin/},
+          (split /:/, $ENV{PATH})){
     for my $f (qw/enc2xs enc2xs5.7.3/){
         my $path = File::Spec->catfile($d, $f);
         -x $path and $enc2xs = $path and last PATHLOOP;