Upgrade to Class::ISA 0.36 (Fixes installation directories only)

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

diff --git a/installperl b/installperl
index a3657ef..1705d34 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -163,6 +163,10 @@ find(sub {
     {
        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{/[^/]*$}{};
 
@@ -709,7 +713,7 @@ sub installlib {
 
     # ignore patch backups, RCS files, emacs backup & temp files and the
     # .exists files, .PL files, and test files.
-    return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$|^dbm_filter_util.pl$} ||
+    return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$|^dbm_filter_util.pl$|^\.gitignore$} ||
              $dir  =~ m{/t(?:/|$)};
     # ignore the cpan script in lib/CPAN/bin, the instmodsh and xsubpp
     # scripts in lib/ExtUtils, the prove script in lib/Test/Harness,
@@ -746,10 +750,10 @@ sub installlib {
     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;