Re: Beta3: Fix bad warning on bitwise ops

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

diff --git a/installperl b/installperl
index 87b81ac..da71458 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -1,6 +1,8 @@
 #!./perl
 BEGIN { @INC=('./lib', '../lib') }
 use File::Find;
+use File::Path qw(mkpath);
+use Config;
 
 $mainperldir = "/usr/bin";
 
@@ -12,40 +14,51 @@ while (@ARGV) {
 
 umask 022;
 
-@scripts = ('cppstdin', 'c2ph', 'h2xs', 'pstruct', 'x2p/s2p', 'x2p/find2perl',
-           'perldoc', 'pod/pod2man', 'pod/pod2html', 'pod/pod2latex' );
+@scripts = qw(cppstdin
+               utils/c2ph utils/h2ph utils/h2xs utils/pstruct
+               utils/perlbug utils/perldoc
+               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 = ('x2p/a2p.man', 'x2p/s2p.man');
+@manpages = qw(x2p/a2p.man x2p/s2p.man);
 
 @pods = (<pod/*.pod>);
 
-# Read in the config file.
-
-open(CONFIG, "config.sh") || die "You haven't run Configure yet!\n";
-while (<CONFIG>) {
-    if (s/^(\w+=)/\$$1/) {
-       $accum =~ s/'undef'/undef/g;
-       eval $accum;
-       $accum = '';
-    }
-    $accum .= $_;
-}
-close CONFIG;
-
 $ver = $];
-$release = substr($ver,0,3);
+$release = substr($ver,0,3);   # Not used presently.
 $patchlevel = substr($ver,3,2);
 die "Patchlevel of perl ($patchlevel)",
-    "and patchlevel of config.sh ($PATCHLEVEL) don't match\n"
-       if $patchlevel != $PATCHLEVEL;
+    "and patchlevel of config.sh ($Config{'PATCHLEVEL'}) don't match\n"
+       if $patchlevel != $Config{'PATCHLEVEL'};
+
+# Fetch some frequently-used items from %Config
+$installbin = $Config{installbin};
+$installscript = $Config{installscript};
+$installprivlib = $Config{installprivlib};
+$installarchlib = $Config{installarchlib};
+$installsitelib = $Config{installsitelib};
+$installsitearch = $Config{installsitearch};
+$installman1dir = $Config{installman1dir};
+$man1ext = $Config{man1ext};
+# Did we build libperl as a shared library?
+$d_shrplib = $Config{d_shrplib};
+$shrpdir = $Config{shrpdir};
+# Shared library and dynamic loading suffixes.
+$so = $Config{so};
+$dlext = $Config{dlext};
+
+$d_dosuid = $Config{d_dosuid};
+$binexp = $Config{binexp};
+$osname = $Config{osname};
 
 # Do some quick sanity checks.
 
 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"
        unless $installbin =~ m#^/afs/# || $nonono;
@@ -61,8 +74,8 @@ if ($d_shrplib) {
        warn "WARNING: Can't find libperl*.$so* to install into $shrpdir.",
            "  (Installing other things anyway.)\n";
     } else {
-       &makedir($shrpdir);
-       -w $shrpdir     || die "$shrpdir is not writable by you\n";
+       mkpath($shrpdir, 1, 0777);
+       -w $shrpdir     || $nonono || die "$shrpdir is not writable by you\n";
        &cmd("cp libperl*.$so* $shrpdir");
     }
 }
@@ -96,7 +109,7 @@ if (! &samepath($installbin, 'x2p')) {
 
 # Install scripts.
 
-&makedir($installscript);
+mkpath($installscript, 1, 0777);
 
 for (@scripts) {
     if (-f $_) {   # cppstdin might not exist on this system.
@@ -106,7 +119,7 @@ for (@scripts) {
 }
 
 # Install pod pages.  Where? I guess in $installprivlib/pod.
-&makedir("${installprivlib}/pod");
+mkpath("${installprivlib}/pod", 1, 0777);
 foreach $file (@pods) {
     # $file is a name like  pod/perl.pod
     cp_if_diff($file, "${installprivlib}/${file}");
@@ -115,7 +128,7 @@ foreach $file (@pods) {
 # Install old man pages.
 
 if ($installman1dir ne '') {
-    &makedir($installman1dir);
+    mkpath($installman1dir, 1, 0777);
 
     if (! &samepath($installman1dir, '.')) {
        for (@manpages) {
@@ -140,8 +153,11 @@ if ($installman1dir ne '') {
 
 $do_installarchlib = $do_installprivlib = 0;
     
-&makedir($installprivlib);
-&makedir($installarchlib);
+mkpath($installprivlib, 1, 0777);
+mkpath($installarchlib, 1, 0777);
+mkpath($installsitelib, 1, 0777) if ($installsitelib);
+mkpath($installsitearch, 1, 0777) if ($installsitearch);
+
 if (chdir "lib") {
     $do_installarchlib = ! &samepath($installarchlib, '.');
     $do_installprivlib = ! &samepath($installprivlib, '.');
@@ -156,7 +172,7 @@ else {
 }
 
 # Install header files and libraries.
-makedir("$installarchlib/CORE");
+mkpath("$installarchlib/CORE", 1, 0777);
 foreach $file (<*.h libperl*.*>) {
     cp_if_diff($file,"$installarchlib/CORE/$file");
 }
@@ -301,19 +317,6 @@ sub chmod {
        unless $nonono;
 }
 
-sub makedir {
-    local($dir) = @_;
-    unless (-d $dir) {
-       local($shortdir) = $dir;
-
-       $shortdir =~ s#(.*)/.*#$1#;
-       &makedir($shortdir);
-
-       print STDERR "  mkdir $dir\n";
-       mkdir($dir, 0777) || warn "Couldn't create $dir: $!\n" unless $nonono;
-    }
-}
-
 sub samepath {
     local($p1, $p2) = @_;
     local($dev1, $ino1, $dev2, $ino2);
@@ -359,8 +362,8 @@ sub installlib {
        system "cmp", "-s", $_, "$installlib/$name";
        if ($?) {
            &unlink("$installlib/$name");
-           &makedir("$installlib/$dir");
-           cp_if_diff("$_", "$installlib/$dir/$_");
+           mkpath("$installlib/$dir", 1, 0777);
+           cp_if_diff($_, "$installlib/$name");
            # HP-UX (at least) needs to maintain execute permissions
            # on dynamically-loaded libraries.
            if ($name =~ /\.(so|$dlext)$/o) {
@@ -371,7 +374,7 @@ sub installlib {
            }
        }
     } elsif (-d $_) {
-       &makedir("$installlib/$name");
+       mkpath("$installlib/$name", 1, 0777);
     }
 }