Pod typos, pod2man bugs, and miscellaneous installation comments

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

diff --git a/installperl b/installperl
index 5632824..183c3ed 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -1,10 +1,16 @@
 #!./perl
 BEGIN { @INC=('./lib', '../lib') }
 use File::Find;
-use File::Path qw(mkpath);
+use File::Path ();
 use Config;
 use subs qw(unlink rename link chmod);
 
+# override the ones in the rest of the script
+sub mkpath
+{
+  File::Path::mkpath(@_) unless $nonono;
+}
+
 $mainperldir = "/usr/bin";
 $exe_ext = $Config{exe_ext};
 
@@ -16,15 +22,11 @@ while (@ARGV) {
 
 umask 022;
 
-@scripts = qw( utils/c2ph utils/h2ph utils/h2xs utils/pstruct
-               utils/perlbug utils/perldoc
+@scripts = qw( utils/c2ph utils/h2ph utils/h2xs
+               utils/perlbug utils/perldoc utils/pl2pm
                x2p/s2p x2p/find2perl
                pod/pod2man pod/pod2html pod/pod2latex pod/pod2text);
 
-# pod documentation now handled by separate installman script.
-# These two are archaic leftovers.
-@manpages = qw(x2p/a2p.man x2p/s2p.man);
-
 @pods = (<pod/*.pod>);
 
 $ver = $];
@@ -57,8 +59,8 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 
    $installbin         || die "No installbin directory in config.sh\n";
 -d $installbin         || mkpath($installbin, 1, 0777);
--d $installbin         || die "$installbin is not a directory\n";
--w $installbin         || die "$installbin is not writable by you\n"
+-d $installbin         || $nonono || die "$installbin is not a directory\n";
+-w $installbin         || $nonono || die "$installbin is not writable by you\n"
        unless $installbin =~ m#^/afs/# || $nonono;
 
 -x 'perl' . $exe_ext   || die "perl isn't executable!\n";
@@ -114,6 +116,11 @@ for (@scripts) {
     s#.*/##; &chmod(0755, "$installscript/$_");
 }
 
+# pstruct should be a link to c2ph
+
+&safe_unlink("$installscript/pstruct");
+&link("$installscript/c2ph","$installscript/pstruct");
+
 # Install pod pages.  Where? I guess in $installprivlib/pod.
 mkpath("${installprivlib}/pod", 1, 0777);
 foreach $file (@pods) {
@@ -121,30 +128,6 @@ foreach $file (@pods) {
     cp_if_diff($file, "${installprivlib}/${file}");
 }
 
-# Install old man pages.
-
-if ($installman1dir ne '') {
-    mkpath($installman1dir, 1, 0777);
-
-    if (! &samepath($installman1dir, '.')) {
-       for (@manpages) {
-           ($new = $_) =~ s/man$/$man1ext/;
-           $new =~ s#.*/##;
-           print STDERR "  Installing $installman1dir/$new\n";
-           next if $nonono;
-           open(MI,$_) || warn "Can't open $_: $!\n";
-           open(MO,">$installman1dir/$new") || 
-                   warn "Can't install $installman1dir/$new: $!\n";
-           print MO ".ds RP Release $release Patchlevel $patchlevel\n";
-           while (<MI>) {
-               print MO;
-           }
-           close MI;
-           close MO;
-       }
-    }
-}
-
 # Install library files.
 
 $do_installarchlib = $do_installprivlib = 0;
@@ -347,6 +330,7 @@ sub samepath {
 sub installlib {
     my $dir = $File::Find::dir;
     $dir =~ s#^\.(?![^/])/?##;
+    local($depth) = $dir ? "lib/$dir" : "lib";
 
     my $name = $_;
     
@@ -373,7 +357,7 @@ sub installlib {
            &unlink("$installarchlib/$name");
        }
        system "cmp", "-s", $_, "$installlib/$name";
-       if ($?) {
+       if ($? || $nonono) {
            &unlink("$installlib/$name");
            mkpath("$installlib/$dir", 1, 0777);
            cp_if_diff($_, "$installlib/$name");
@@ -403,9 +387,12 @@ sub cp_if_diff {
     my($from,$to)=@_;
     -f $from || die "$0: $from not found";
     system "cmp", "-s", $from, $to;
-    if ($?) {
+    if ($? || $nonono) {
        my ($atime, $mtime);
        unlink($to);   # In case we don't have write permissions.
+        if ($nonono) {
+            $from = $depth . "/" . $from if $depth;
+        }
        cmd("cp $from $to");
        # Restore timestamps if it's a .a library.
        if ($to =~ /\.a$/) {