Tweak the equivalence tables once again.

[perl5.git] / installperl

diff --git a/installperl b/installperl
index 7689005..faf1c70 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -57,7 +57,7 @@ while (@ARGV) {
 umask 022 unless $Is_VMS;
 
 my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
-               utils/pl2pm utils/splain utils/perlcc
+               utils/pl2pm utils/splain utils/perlcc utils/dprofpp
                x2p/s2p x2p/find2perl 
                pod/pod2man pod/pod2html pod/pod2latex pod/pod2text
                pod/pod2usage pod/podchecker pod/podselect);
@@ -158,7 +158,7 @@ if ($Is_Cygwin) {
   };
 } else {
   $perldll = 'perl.' . $dlext;
-  $perldll = 'perlcore.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i;
+  $perldll = 'perl56.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i;
 }
 
 -f $perldll || die "No perl DLL built\n";
@@ -245,10 +245,6 @@ else {
     # [als] hard-coded 'libperl' name... not good!
     @corefiles = <*.h libperl*.*>;
 
-    # cygwin needs special stub for dll loading
-    push @corefiles, 'impure_ptr.o'
-      if ($Is_Cygwin and $Config{useshrplib} eq 'true');
-
     # AIX needs perl.exp installed as well.
     push(@corefiles,'perl.exp') if $^O eq 'aix';
     if ($^O eq 'mpeix') {
@@ -382,7 +378,7 @@ unless ( $versiononly && !($installprivlib =~ m/\Q$]/)) {
        if (/^=.*\.$/m) {
            my ($from, $to) = ("${installprivlib}/pod/perldiag.pod",
                               "${installprivlib}/pod/perldiag-5.003.pod");
-           print STDERR "  rename $from $to";
+           print "  rename $from $to";
            rename($from, $to)
                or warn "Couldn't rename $from to $to: $!\n"
                unless $nonono;
@@ -415,14 +411,17 @@ if (!$versiononly) {
         }
     }
     my @otherperls;
+    my %otherperls;
     for (@path) {
        next unless m,^/,;
        # Use &samepath here because some systems have other dirs linked
        # to $mainperldir (like SunOS)
        next if samepath($_, $binexp);
        next if ($mainperl_is_instperl && samepath($_, $mainperldir));
-       push(@otherperls, "$_/$perl$exe_ext")
-           if (-x "$_/$perl$exe_ext" && ! -d "$_/$perl$exe_ext");
+        my $otherperl = "$_/$perl$exe_ext";
+       next if $otherperls{$otherperl}++;
+       push(@otherperls, $otherperl)
+           if (-x $otherperl && ! -d $otherperl);
     }
     if (@otherperls) {
        print STDERR "\nWarning: $perl appears in your path in the following " .
@@ -436,7 +435,7 @@ if (!$versiononly) {
 }
 
 $packlist->write() unless $nonono;
-print STDERR "  Installation complete\n";
+print "  Installation complete\n";
 
 exit 0;
 
@@ -446,7 +445,7 @@ sub yn {
     my($prompt) = @_;
     my($answer);
     my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
-    print STDERR $prompt;
+    print $prompt;
     chop($answer = <STDIN>);
     $answer = $default if $answer =~ m/^\s*$/;
     ($answer =~ m/^[yY]/);
@@ -461,7 +460,7 @@ sub unlink {
     foreach my $name (@names) {
        next unless -e $name;
        chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin);
-       print STDERR "  unlink $name\n";
+       print "  unlink $name\n";
        ( CORE::unlink($name) and ++$cnt 
          or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
     }
@@ -474,11 +473,11 @@ sub safe_unlink {
     foreach my $name (@names) {
        next unless -e $name;
        chmod 0777, $name if ($Is_OS2 || $Is_W32);
-       print STDERR "  unlink $name\n";
+       print "  unlink $name\n";
        next if CORE::unlink($name);
        warn "Couldn't unlink $name: $!\n";
        if ($! =~ /busy/i) {
-           print STDERR "  mv $name $name.old\n";
+           print "  mv $name $name.old\n";
            safe_rename($name, "$name.old")
                or warn "Couldn't rename $name: $!\n";
        }
@@ -503,7 +502,7 @@ sub link {
     my($from,$to) = @_;
     my($success) = 0;
 
-    print STDERR "  ln $from $to\n";
+    print "  ln $from $to\n";
     eval {
        CORE::link($from, $to)
            ? $success++
@@ -514,7 +513,7 @@ sub link {
         $packlist->{$to} = { from => $from, type => 'link' };
     };
     if ($@) {
-       print STDERR "  creating new version of $to\n" if $Is_VMS and -e $to;
+       print "  creating new version of $to\n" if $Is_VMS and -e $to;
        File::Copy::copy($from, $to)
            ? $success++
            : warn "Couldn't copy $from to $to: $!\n"
@@ -528,7 +527,7 @@ sub chmod {
     my($mode,$name) = @_;
 
     return if ($^O eq 'dos');
-    printf STDERR "  chmod %o %s\n", $mode, $name;
+    printf "  chmod %o %s\n", $mode, $name;
     CORE::chmod($mode,$name)
        || warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name)
       unless $nonono;
@@ -537,8 +536,8 @@ sub chmod {
 sub copy {
     my($from,$to) = @_;
 
-    print STDERR "  cp $from $to\n";
-    print STDERR "  creating new version of $to\n" if $Is_VMS and -e $to;
+    print "  cp $from $to\n";
+    print "  creating new version of $to\n" if $Is_VMS and -e $to;
     File::Copy::copy($from, $to)
        || warn "Couldn't copy $from to $to: $!\n"
       unless $nonono;
@@ -652,10 +651,10 @@ sub strip
 
     foreach my $file (@args) {
         if (-f $file) {
-            print STDERR "  strip $file\n";
+            print "  strip $file\n";
             system("strip", @opts, $file);
         } else {
-            print STDERR "# file '$file' skipped\n";
+            print "# file '$file' skipped\n";
         }
     }
 }