doio.c:Perl_my_lstat:/* XXX Do really need to be calling SvPV() all these times? */

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

diff --git a/installperl b/installperl
index 3b05231..f635918 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -54,6 +54,7 @@ use File::Compare;
 use File::Copy ();
 use File::Path ();
 use ExtUtils::Packlist;
+use Cwd;
 use Config;
 use subs qw(unlink link chmod);
 
@@ -285,39 +286,8 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {
        my $v_e_r_s = $ver; $v_e_r_s =~ tr/./_/;
        $perldll =~ s/(\..*)?$/$v_e_r_s.$dlext/;
        $perldll =~ s/^lib/cyg/;
-       if ($Config{useshrplib} eq 'true') {
-           # install ld2 and perlld as well
-           foreach ('ld2', 'perlld') {
-               safe_unlink("$installbin/$_");
-               copy("$_", "$installbin/$_");
-               chmod(0755, "$installbin/$_");
-               $packlist->{"$installbin/$_"} = { type => 'file' };
-           };
-           open (LD2, ">$installbin/ld2");
-           print LD2 <<SHELL;
-#!/bin/sh
-#
-# ld wrapper, passes all args to perlld;
-#
-for trythis in $installbin/perl
-do
-  if [ -x \$trythis ]
-  then
-    \$trythis $installbin/perlld "\$\@"
-    exit \$?
-  fi
-done
-# hard luck!
-echo I see no perl executable around there
-echo perl is required to build dynamic libraries
-echo look if the path to perl in /bin/ld2 is correct
-exit 1
-SHELL
-           close LD2;
-           chmod(0755, "$installbin/ld2");
-       };
     } else {
-       $perldll = 'perl59.' . $dlext;
+       $perldll = 'perl511.' . $dlext;
     }
 
     if ($dlsrc ne "dl_none.xs") {
@@ -651,6 +621,7 @@ if (!$versiononly && $otherperls) {
        # Use &samepath here because some systems have other dirs linked
        # to $mainperldir (like SunOS)
        next if samepath($_, $binexp);
+       next if samepath($_, cwd());
        next if ($mainperl_is_instperl && samepath($_, $mainperldir));
        my $otherperl = "$_/$perl$exe_ext";
        next if $otherperls{$otherperl}++;
@@ -837,14 +808,16 @@ sub installlib {
     return if $dir =~ m{\bXS/(?:APItest|Typemap)\b};
     return if $name =~ m{\b(?:APItest|Typemap)\.pm$};
     # ignore the demo files
-    return if $dir =~ /\bdemos?\b/;
+    return if $dir =~ /\b(?:demos?|eg)\b/;
 
     # ignore READMEs, MANIFESTs, INSTALL docs, META.ymls and change logs.
     # Changes.e2x and README.e2x are needed by enc2xs.
     return if $name =~ m{^(?:README(?:\.\w+)?)$} && $name ne 'README.e2x';
-    return if $name =~ m{^(?:MANIFEST|META\.yml|INSTALL)$};
-    return if $name =~ m{^(?:TODO|BUGS|CREDITS)$}i;
+    return if $name =~ m{^(?:MANIFEST|META\.yml)$};
+    return if $name =~ m{^(?:INSTALL|TODO|BUGS|CREDITS)$}i;
     return if $name =~ m{^change(?:s|log)(?:\.libnet)?$}i;
+    return if $name =~ m{^(?:SIGNATURE|PAUSE200\d\.pub)$}; # CPAN files
+    return if $name =~ m{^(?:NOTES|PATCHING)$}; # ExtUtils files
 
     # if using a shared perl library then ignore:
     # - static library files [of statically linked extensions];