Patch from Andreas.

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

diff --git a/installperl b/installperl
index 87b81ac..be8c8a8 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -1,6 +1,7 @@
 #!./perl
 BEGIN { @INC=('./lib', '../lib') }
 use File::Find;
+use Config;
 
 $mainperldir = "/usr/bin";
 
@@ -12,40 +13,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         || makedir($installbin);
 -d $installbin         || die "$installbin is not a directory\n";
 -w $installbin         || die "$installbin is not writable by you\n"
        unless $installbin =~ m#^/afs/# || $nonono;
@@ -142,6 +154,9 @@ $do_installarchlib = $do_installprivlib = 0;
     
 &makedir($installprivlib);
 &makedir($installarchlib);
+&makedir($installsitelib) if ($installsitelib);
+&makedir($installsitearch) if ($installsitearch);
+
 if (chdir "lib") {
     $do_installarchlib = ! &samepath($installarchlib, '.');
     $do_installprivlib = ! &samepath($installprivlib, '.');
@@ -360,7 +375,7 @@ sub installlib {
        if ($?) {
            &unlink("$installlib/$name");
            &makedir("$installlib/$dir");
-           cp_if_diff("$_", "$installlib/$dir/$_");
+           cp_if_diff($_, "$installlib/$name");
            # HP-UX (at least) needs to maintain execute permissions
            # on dynamically-loaded libraries.
            if ($name =~ /\.(so|$dlext)$/o) {