X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=f635918796b8b6b18e7ad45cb4508bde3473be75;hb=b16276bb9e16a3b99d6fb450f4e0902e32b01f85;hp=0f7e6ebaa3156f7b52af8cefad2ba15ddcb987f7;hpb=021db424163d574093ff658e9606a6f31942189d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index 0f7e6eb..f635918 100755
--- 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}++;