Add missing syms to global.sym; update magic doc

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

diff --git a/installperl b/installperl
index 8f8f7e7..c9913ca 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -1,6 +1,7 @@
 #!./perl
 BEGIN { @INC=('./lib', '../lib') }
 use File::Find;
+use File::Compare;
 use File::Path ();
 use Config;
 use subs qw(unlink rename link chmod);
@@ -23,7 +24,7 @@ while (@ARGV) {
 umask 022;
 
 @scripts = qw( utils/c2ph utils/h2ph utils/h2xs
-               utils/perlbug utils/perldoc utils/pl2pm
+               utils/perlbug utils/perldoc utils/pl2pm utils/splain
                x2p/s2p x2p/find2perl
                pod/pod2man pod/pod2html pod/pod2latex pod/pod2text);
 
@@ -73,6 +74,7 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 
 &safe_unlink("$installbin/perl$ver$exe_ext");
 &cmd("cp perl$exe_ext $installbin/perl$ver$exe_ext");
+&chmod(0755, "$installbin/perl$ver$exe_ext");
 
 &safe_unlink("$installbin/sperl$ver$exe_ext");
 if ($d_dosuid) {
@@ -167,27 +169,30 @@ foreach $file (@corefiles) {
 $mainperl_is_instperl = 0;
 
 if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) {
-    # First make sure $mainperldir/perl is not already the same as
-    # the perl we just installed
-    if (-x "$mainperldir/perl$exe_ext") {
+    local($usrbinperl) = "$mainperldir/perl$exe_ext";
+    local($instperl)   = "$installbin/perl$exe_ext";
+    local($expinstperl)        = "$binexp/perl$exe_ext";
+
+    # First make sure $usrbinperl is not already the same as the perl we
+    # just installed.
+    if (-x $usrbinperl) {
        # Try to be clever about mainperl being a symbolic link
        # to binexp/perl if binexp and installbin are different.
        $mainperl_is_instperl =
-           &samepath("$mainperldir/perl$exe_ext", "$installbin/perl$exe_ext") ||
+           &samepath($usrbinperl, $instperl) ||
             (($binexp ne $installbin) &&
-             (-l "$mainperldir/perl$exe_ext") &&
-             ((readlink "$mainperldir/perl$exe_ext") eq "$binexp/perl$exe_ext"));
+             (-l $usrbinperl) &&
+             ((readlink $usrbinperl) eq $expinstperl));
     }
     if ((! $mainperl_is_instperl) &&
-       (&yn("Many scripts expect perl to be installed as " .
-            "$mainperldir/perl.\n" . 
-            "Do you wish to have $mainperldir/perl be the same as\n" .
-            "$binexp/perl? [y] ")))
+       (&yn("Many scripts expect perl to be installed as $usrbinperl.\n" . 
+            "Do you wish to have $usrbinperl be the same as\n" .
+            "$expinstperl? [y] ")))
     {  
-       unlink("$mainperldir/perl$exe_ext");
-       CORE::link("$installbin/perl$exe_ext", "$mainperldir/perl$exe_ext") ||
-           symlink("$binexp/perl$exe_ext", "$mainperldir/perl$exe_ext") ||
-               cmd("cp $installbin/perl$exe_ext $mainperldir$exe_ext");
+       unlink($usrbinperl);
+       eval { CORE::link $instperl, $usrbinperl } ||
+           eval { symlink $expinstperl, $usrbinperl } ||
+               cmd("cp $instperl $usrbinperl");
        $mainperl_is_instperl = 1;
     }
 }
@@ -340,7 +345,7 @@ sub installlib {
     $name = "$dir/$name" if $dir ne '';
 
     my $installlib = $installprivlib;
-    if ((substr($dir, 0, 4) eq 'auto') || ($name eq 'Config.pm')) {
+    if ($dir =~ /^auto/ || $name =~ /^(Config|FileHandle|Safe)\.pm$/) {
         $installlib = $installarchlib;
        return unless $do_installarchlib;
     } else {
@@ -356,8 +361,7 @@ sub installlib {
            #This might not work because $archname might have changed.
            &unlink("$installarchlib/$name");
        }
-       system "cmp", "-s", $_, "$installlib/$name";
-       if ($? || $nonono) {
+       if (compare($_, "$installlib/$name") || $nonono) {
            &unlink("$installlib/$name");
            mkpath("$installlib/$dir", 1, 0777);
            cp_if_diff($_, "$installlib/$name");
@@ -386,8 +390,7 @@ sub installlib {
 sub cp_if_diff {
     my($from,$to)=@_;
     -f $from || die "$0: $from not found";
-    system "cmp", "-s", $from, $to;
-    if ($? || $nonono) {
+    if (compare($from, $to) || $nonono) {
        my ($atime, $mtime);
        unlink($to);   # In case we don't have write permissions.
         if ($nonono) {