#!./perl
BEGIN { @INC=('./lib', '../lib') }
use File::Find;
+use File::Compare;
use File::Path ();
use Config;
use subs qw(unlink rename link chmod);
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);
&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) {
# If they have built sperl.o...
push(@corefiles,'sperl.o') if -f 'sperl.o';
foreach $file (@corefiles) {
- cp_if_diff($file,"$installarchlib/CORE/$file");
- &chmod($file =~ /^libperl/ ? 0555 : 0444,"$installarchlib/CORE/$file");
+ # HP-UX (at least) needs to maintain execute permissions
+ # on dynamically-loaded libraries.
+ cp_if_diff($file,"$installarchlib/CORE/$file")
+ and &chmod($file =~ /^\.(so|$dlext)$/ ? 0555 : 0444,
+ "$installarchlib/CORE/$file");
}
# Offer to install perl in a "standard" location
$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) ||
+ &samepath($usrbinperl, $expinstperl) ||
(($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;
}
}
$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 {
#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");
# HP-UX (at least) needs to maintain execute permissions
# on dynamically-loaded libraries.
- if ($name =~ /\.(so|$dlext)$/o) {
- &chmod(0555, "$installlib/$name");
- }
- else {
- &chmod(0444, "$installlib/$name");
- }
+ cp_if_diff($_, "$installlib/$name")
+ and &chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444,
+ "$installlib/$name");
}
} elsif (-d $_) {
mkpath("$installlib/$name", 1, 0777);
# and then try to link against the installed libperl.a, you might
# get an error message to the effect that the symbol table is older
# than the library.
+# Return true if copying occurred.
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) {
}
cmd("cp $from $to");
# Restore timestamps if it's a .a library.
- if ($to =~ /\.a$/) {
+ if ($to =~ /\.a$/ or $^O eq 'os2') { # For binary install
($atime, $mtime) = (stat $from)[8,9];
utime $atime, $mtime, $to;
}
+ 1;
}
}