Moved Module::Load from lib/ to ext/

[p5sagit/p5-mst-13.2.git] / installperl

diff --git a/installperl b/installperl
index 93c0c9f..6f4a369 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -158,10 +158,15 @@ my @nonxs = grep(!/^Errno$/, split(' ', $Config{'nonxs_ext'}));
 
 find(sub {
     if (($File::Find::name =~ m{^ext\b(.*)/([^/]+)\.pm$}) &&
-        ! grep { $File::Find::name =~ /^ext\/$_/ } @nonxs)
+        ! grep { (my $dir = $_) =~ s/\//-/g;
+                 $File::Find::name =~ /^ext\/$dir/ } @nonxs)
     {
        my($path, $modname) = ($1,$2);
 
+       # Change hypenated name like Filter-Util-Call to nested
+       # directory name Filter/Util/Call
+       $path =~ s{-}{/}g;
+
        # strip to optional "/lib", or remove trailing component
        $path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{};
 
@@ -742,11 +747,13 @@ sub installlib {
 
     $name = "$dir/$name" if $dir ne '';
 
+    return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS;
+
     my $installlib = $installprivlib;
-    if ($dir =~ /^auto/ ||
+    if ($dir =~ /^auto\// ||
          ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
          ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) ||
-         $name=~/^Config_(heavy\|git)\.pl\z/
+         $name=~/^Config_(heavy|git)\.pl\z/
        ) {
        $installlib = $installarchlib;
        return unless $do_installarchlib;