Change 33158 by [EMAIL PROTECTED] on 2008/01/31 21:47:25

        Integrate:
        [ 33031]
        Subject: [PATCH] Ignore build dir when installing perl
        From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
        Date: Sat, 19 Jan 2008 12:19:41 -0500
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/maint-5.10/perl/installperl#2 integrate

Differences ...

==== //depot/maint-5.10/perl/installperl#2 (xtext) ====
Index: perl/installperl
--- perl/installperl#1~32694~   2007-12-22 01:23:09.000000000 -0800
+++ perl/installperl    2008-01-31 13:47:25.000000000 -0800
@@ -54,6 +54,7 @@
 use File::Copy ();
 use File::Path ();
 use ExtUtils::Packlist;
+use Cwd;
 use Config;
 use subs qw(unlink link chmod);
 
@@ -620,6 +621,7 @@
        # 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}++;
End of Patch.

Reply via email to