X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=6d2fad9bdc634b1edec9122a8cfde282dee10b7a;hb=3f9aafa052abab5917516312e3f78b01a9ea73c3;hp=da714586fac202b77f9a5c1c216b31e43ca426e2;hpb=c07a80fdfe3926b5eb0585b674aa5d1f57b32ade;p=p5sagit%2Fp5-mst-13.2.git diff --git a/installperl b/installperl index da71458..6d2fad9 100755 --- a/installperl +++ b/installperl @@ -1,10 +1,37 @@ #!./perl -BEGIN { @INC=('./lib', '../lib') } + +BEGIN { + require 5.004; + chdir '..' if !-d 'lib' and -d '..\lib'; + @INC = 'lib'; + $ENV{PERL5LIB} = 'lib'; + $Is_VMS = $^O eq 'VMS'; + $Is_W32 = $^O eq 'MSWin32'; + $Is_OS2 = $^O eq 'os2'; + if ($Is_VMS) { eval 'use VMS::Filespec;' } +} + +$scr_ext = ($Is_VMS ? '.Com' : $Is_W32 ? '.bat' : ''); + use File::Find; -use File::Path qw(mkpath); +use File::Compare; +use File::Copy (); +use File::Path (); +use ExtUtils::Packlist; use Config; +use subs qw(unlink link chmod); +use vars qw($packlist); + +# override the ones in the rest of the script +sub mkpath { + File::Path::mkpath(@_) unless $nonono; +} $mainperldir = "/usr/bin"; +$exe_ext = $Config{exe_ext}; + +# Allow ``make install PERLNAME=something_besides_perl'': +$perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl'; while (@ARGV) { $nonono = 1 if $ARGV[0] eq '-n'; @@ -12,20 +39,44 @@ while (@ARGV) { shift; } -umask 022; +umask 022 unless $Is_VMS; -@scripts = qw(cppstdin - utils/c2ph utils/h2ph utils/h2xs utils/pstruct - utils/perlbug utils/perldoc - x2p/s2p x2p/find2perl +@scripts = qw( utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc + utils/pl2pm utils/splain utils/perlcc + 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); +if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; } @pods = (); +# Specify here any .pm files that are actually architecture-dependent. +# (Those included with XS extensions under ext/ are automatically +# added later.) +# Now that the default privlib has the full perl version number included, +# we no longer have to play the trick of sticking version-specific .pm +# files under the archlib directory. +%archpms = ( + Config => 1, +); + +if ($^O eq 'dos') { + push(@scripts,'djgpp/fixpmain'); + $archpms{config} = $archpms{filehand} = 1; +} + +if ((-e "testcompile") && (defined($ENV{'COMPILE'}))) +{ + push(@scripts, map("$_.exe", @scripts)); +} + +find(sub { + if ("$File::Find::dir/$_" =~ m{^ext/[^/]+/(.*)\.pm$}) { + (my $pm = $1) =~ s{^lib/}{}; + $archpms{$pm} = 1; + } + }, 'ext'); + $ver = $]; $release = substr($ver,0,3); # Not used presently. $patchlevel = substr($ver,3,2); @@ -42,16 +93,21 @@ $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}; +$libperl = $Config{libperl}; # Shared library and dynamic loading suffixes. $so = $Config{so}; $dlext = $Config{dlext}; $d_dosuid = $Config{d_dosuid}; $binexp = $Config{binexp}; -$osname = $Config{osname}; + +if ($Is_VMS) { # Hang in there until File::Spec hits the big time + foreach ( \$installbin, \$installscript, \$installprivlib, + \$installarchlib, \$installsitelib, \$installsitearch, + \$installman1dir ) { + $$_ = unixify($$_); $$_ =~ s:/$::; + } +} # Do some quick sanity checks. @@ -59,94 +115,57 @@ 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' || die "perl isn't executable!\n"; --x 'suidperl' || die "suidperl isn't executable!\n" if $d_dosuid; +-x 'perl' . $exe_ext || die "perl isn't executable!\n"; +-x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid; --x 't/TEST' || warn "WARNING: You've never run 'make test'!!!", - " (Installing anyway.)\n"; +-x 't/TEST' || $Is_W32 + || warn "WARNING: You've never run 'make test'!!!", + " (Installing anyway.)\n"; -if ($d_shrplib) { - if (!) { - warn "WARNING: Can't find libperl*.$so* to install into $shrpdir.", - " (Installing other things anyway.)\n"; - } else { - mkpath($shrpdir, 1, 0777); - -w $shrpdir || $nonono || die "$shrpdir is not writable by you\n"; - &cmd("cp libperl*.$so* $shrpdir"); - } -} - -# First we install the version-numbered executables. +if ($Is_W32) { -&safe_unlink("$installbin/perl$ver"); -&cmd("cp perl $installbin/perl$ver"); +$perldll = 'perl.' . $dlext; +$perldll = 'perlcore.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i; -&safe_unlink("$installbin/sperl$ver"); -if ($d_dosuid) { - &cmd("cp suidperl $installbin/sperl$ver"); - &chmod(04711, "$installbin/sperl$ver"); -} +-f $perldll || die "No perl DLL built\n"; -exit 0 if $versiononly; +# Install the DLL -# Make links to ordinary names if installbin directory isn't current directory. - -if (! &samepath($installbin, '.')) { - &safe_unlink("$installbin/perl", "$installbin/suidperl"); - &link("$installbin/perl$ver", "$installbin/perl"); - &link("$installbin/sperl$ver", "$installbin/suidperl") if $d_dosuid; -} - -if (! &samepath($installbin, 'x2p')) { - &safe_unlink("$installbin/a2p"); - &cmd("cp x2p/a2p $installbin/a2p"); - &chmod(0755, "$installbin/a2p"); +safe_unlink("$installbin/$perldll"); +copy("$perldll", "$installbin/$perldll"); +chmod(0755, "$installbin/$perldll"); } -# Install scripts. +# This will be used to store the packlist +$packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); -mkpath($installscript, 1, 0777); +# First we install the version-numbered executables. -for (@scripts) { - if (-f $_) { # cppstdin might not exist on this system. - &cmd("cp $_ $installscript"); - s#.*/##; &chmod(0755, "$installscript/$_"); - } +if ($Is_VMS) { + safe_unlink("$installbin/$perl$exe_ext"); + copy("perl$exe_ext", "$installbin/$perl$exe_ext"); + chmod(0755, "$installbin/$perl$exe_ext"); + safe_unlink("$installbin/${perl}shr$exe_ext"); + copy("perlshr$exe_ext", "$installbin/${perl}shr$exe_ext"); + chmod(0755, "$installbin/${perl}shr$exe_ext"); +} +elsif ($^O ne 'dos') { + safe_unlink("$installbin/$perl$ver$exe_ext"); + copy("perl$exe_ext", "$installbin/$perl$ver$exe_ext"); + chmod(0755, "$installbin/$perl$ver$exe_ext"); +} else { + safe_unlink("$installbin/$perl.exe"); + copy("perl.exe", "$installbin/$perl.exe"); } -# Install pod pages. Where? I guess in $installprivlib/pod. -mkpath("${installprivlib}/pod", 1, 0777); -foreach $file (@pods) { - # $file is a name like pod/perl.pod - 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 () { - print MO; - } - close MI; - close MO; - } - } +safe_unlink("$installbin/s$perl$ver$exe_ext"); +if ($d_dosuid) { + copy("suidperl$exe_ext", "$installbin/s$perl$ver$exe_ext"); + chmod(04711, "$installbin/s$perl$ver$exe_ext"); } # Install library files. @@ -159,8 +178,9 @@ mkpath($installsitelib, 1, 0777) if ($installsitelib); mkpath($installsitearch, 1, 0777) if ($installsitearch); if (chdir "lib") { - $do_installarchlib = ! &samepath($installarchlib, '.'); - $do_installprivlib = ! &samepath($installprivlib, '.'); + $do_installarchlib = ! samepath($installarchlib, '.'); + $do_installprivlib = ! samepath($installprivlib, '.'); + $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$]/); if ($do_installarchlib || $do_installprivlib) { find(\&installlib, '.'); @@ -173,71 +193,179 @@ else { # Install header files and libraries. mkpath("$installarchlib/CORE", 1, 0777); -foreach $file (<*.h libperl*.*>) { - cp_if_diff($file,"$installarchlib/CORE/$file"); +if ($Is_VMS) { # We did core file selection during build + my $coredir = "lib/$Config{'arch'}/$]"; + $coredir =~ tr/./_/; + @corefiles = <$coredir/*.*>; +} +else { + @corefiles = <*.h libperl*.*>; + # AIX needs perl.exp installed as well. + push(@corefiles,'perl.exp') if $^O eq 'aix'; + # If they have built sperl.o... + push(@corefiles,'sperl.o') if -f 'sperl.o'; +} +foreach $file (@corefiles) { + # HP-UX (at least) needs to maintain execute permissions + # on dynamically-loadable libraries. So we do it for all. + copy_if_diff($file,"$installarchlib/CORE/$file") + and chmod($file =~ /\.(so|\Q$dlext\E)$/ ? 0555 : 0444, + "$installarchlib/CORE/$file"); } -# AIX needs perl.exp installed as well. -cp_if_diff("perl.exp" ,"$installarchlib/CORE/perl.exp") if ($osname eq 'aix'); -# If they have built sperl.o... -cp_if_diff("sperl.o" ,"$installarchlib/CORE/sperl.o") if (-f 'sperl.o'); +# Install main perl executables +# Make links to ordinary names if installbin directory isn't current directory. +if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) { + safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext"); + link("$installbin/$perl$ver$exe_ext", "$installbin/$perl$exe_ext"); + link("$installbin/s$perl$ver$exe_ext", "$installbin/suid$perl$exe_ext") + if $d_dosuid; +} # 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") { +if (!$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR + && -w $mainperldir && ! samepath($mainperldir, $installbin)) { + 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", "$installbin/perl") || + samepath($usrbinperl, $instperl) || + samepath($usrbinperl, $expinstperl) || (($binexp ne $installbin) && - (-l "$mainperldir/perl") && - ((readlink "$mainperldir/perl") eq "$binexp/perl")); + (-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"); - eval 'link("$installbin/perl", "$mainperldir/perl")' || - eval 'symlink("$binexp/perl", "$mainperldir/perl")' || - &cmd("cp $installbin/perl $mainperldir"); + unlink($usrbinperl); + eval { CORE::link $instperl, $usrbinperl } || + eval { symlink $expinstperl, $usrbinperl } || + copy($instperl, $usrbinperl); $mainperl_is_instperl = 1; } } +# Make links to ordinary names if installbin directory isn't current directory. + +if (!$versiononly && ! samepath($installbin, 'x2p')) { + safe_unlink("$installbin/a2p$exe_ext"); + copy("x2p/a2p$exe_ext", "$installbin/a2p$exe_ext"); + chmod(0755, "$installbin/a2p$exe_ext"); +} + +# cppstdin is just a script, but it is architecture-dependent, so +# it can't safely be shared. Place it in $installbin. +# Note that Configure doesn't build cppstin if it isn't needed, so +# we skip this if cppstdin doesn't exist. +if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) { + safe_unlink("$installbin/cppstdin"); + copy("cppstdin", "$installbin/cppstdin"); + chmod(0755, "$installbin/cppstdin"); +} + +# Install scripts. + +mkpath($installscript, 1, 0777); + +if (! $versiononly) { + for (@scripts) { + (my $base = $_) =~ s#.*/##; + copy($_, "$installscript/$base"); + chmod(0755, "$installscript/$base"); + } +} + +# pstruct should be a link to c2ph + +if (! $versiononly) { + safe_unlink("$installscript/pstruct$scr_ext"); + if ($^O eq 'dos' or $Is_VMS) { + copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); + } else { + link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); + } +} + +# Install pod pages. Where? I guess in $installprivlib/pod. + +if (! $versiononly || !($installprivlib =~ m/\Q$]/)) { + mkpath("${installprivlib}/pod", 1, 0777); + + # If Perl 5.003's perldiag.pod is there, rename it. + if (open POD, "${installprivlib}/pod/perldiag.pod") { + read POD, $_, 4000; + close POD; + # Some of Perl 5.003's diagnostic messages ended with periods. + if (/^=.*\.$/m) { + my ($from, $to) = ("${installprivlib}/pod/perldiag.pod", + "${installprivlib}/pod/perldiag-5.003.pod"); + print STDERR " rename $from $to"; + rename($from, $to) + or warn "Couldn't rename $from to $to: $!\n" + unless $nonono; + } + } + + foreach $file (@pods) { + # $file is a name like pod/perl.pod + copy_if_diff($file, "${installprivlib}/${file}"); + } + +} + # Check to make sure there aren't other perls around in installer's # path. This is probably UNIX-specific. Check all absolute directories # in the path except for where public executables are supposed to live. # Also skip $mainperl if the user opted to have it be a link to the # installed perl. -@path = split(/:/, $ENV{"PATH"}); -@otherperls = (); -for (@path) { - next unless m,^/,; - next if ($_ eq $binexp); - # Use &samepath here because some systems have other dirs linked - # to $mainperldir (like SunOS) - next if ($mainperl_is_instperl && &samepath($_, $mainperldir)); - push(@otherperls, "$_/perl") if (-x "$_/perl" && ! -d "$_/perl"); -} -if (@otherperls) { - print STDERR "\nWarning: perl appears in your path in the following " . - "locations beyond where\nwe just installed it:\n"; - for (@otherperls) { - print STDERR " ", $_, "\n"; +if (!$versiononly) { + + $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ; + ($path = $ENV{"PATH"}) =~ s:\\:/:g ; + @path = split(/$dirsep/, $path); + if ($Is_VMS) { + my $i = 0; + while (exists $ENV{'DCL$PATH' . $i}) { + $dir = unixpath($ENV{'DCL$PATH' . $i}); $dir =~ s-/$--; + push(@path,$dir); + } + } + @otherperls = (); + for (@path) { + next unless m,^/,; + # Use &samepath here because some systems have other dirs linked + # to $mainperldir (like SunOS) + next if samepath($_, $binexp); + next if ($mainperl_is_instperl && samepath($_, $mainperldir)); + push(@otherperls, "$_/$perl$exe_ext") + if (-x "$_/$perl$exe_ext" && ! -d "$_/$perl$exe_ext"); } - print STDERR "\n"; + if (@otherperls) { + print STDERR "\nWarning: $perl appears in your path in the following " . + "locations beyond where\nwe just installed it:\n"; + for (@otherperls) { + print STDERR " ", $_, "\n"; + } + print STDERR "\n"; + } + } +$packlist->write() unless $nonono; print STDERR " Installation complete\n"; exit 0; @@ -256,72 +384,104 @@ sub yn { sub unlink { local(@names) = @_; + my($cnt) = 0; + + return scalar(@names) if $Is_VMS; foreach $name (@names) { next unless -e $name; + chmod 0777, $name if ($Is_OS2 || $Is_W32); print STDERR " unlink $name\n"; - unlink($name) || warn "Couldn't unlink $name: $!\n" unless $nonono; + ( CORE::unlink($name) and ++$cnt + or warn "Couldn't unlink $name: $!\n" ) unless $nonono; } + return $cnt; } sub safe_unlink { - local(@names) = @_; - + return if $nonono or $Is_VMS; + local @names = @_; foreach $name (@names) { next unless -e $name; + chmod 0777, $name if ($Is_OS2 || $Is_W32); print STDERR " unlink $name\n"; - next if $nonono; - next if unlink($name); + next if CORE::unlink($name); warn "Couldn't unlink $name: $!\n"; if ($! =~ /busy/i) { print STDERR " mv $name $name.old\n"; - &rename($name, "$name.old") || warn "Couldn't rename $name: $!\n"; + safe_rename($name, "$name.old") + or warn "Couldn't rename $name: $!\n"; } } } -sub cmd { - local($cmd) = @_; - print STDERR " $cmd\n"; - unless ($nonono) { - system $cmd; - warn "Command failed!!!\n" if $?; - } -} - -sub rename { +sub safe_rename { local($from,$to) = @_; - unless (unlink($to)) { + if (-f $to and not unlink($to)) { my($i); for ($i = 1; $i < 50; $i++) { last if rename($to, "$to.$i"); } - return 0 if $i >= 50; # Give up! + warn("Cannot rename to `$to.$i': $!"), return 0 + if $i >= 50; # Give up! } link($from,$to) || return 0; unlink($from); } sub link { - local($from,$to) = @_; + my($from,$to) = @_; + my($success) = 0; print STDERR " ln $from $to\n"; - link($from,$to) || warn "Couldn't link $from to $to: $!\n" unless $nonono; + eval { + CORE::link($from, $to) + ? $success++ + : ($from =~ m#^/afs/# || $to =~ m#^/afs/#) + ? die "AFS" # okay inside eval {} + : warn "Couldn't link $from to $to: $!\n" + unless $nonono; + $packlist->{$to} = { from => $from, type => 'link' }; + }; + if ($@) { + print STDERR " creating new version of $to\n" if $Is_VMS and -e $to; + File::Copy::copy($from, $to) + ? $success++ + : warn "Couldn't copy $from to $to: $!\n" + unless $nonono; + $packlist->{$to} = { type => 'file' }; + } + $success; } sub chmod { local($mode,$name) = @_; + return if ($^O eq 'dos'); printf STDERR " chmod %o %s\n", $mode, $name; - chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s: $!\n",$mode,$name) - unless $nonono; + CORE::chmod($mode,$name) + || warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name) + unless $nonono; +} + +sub copy { + my($from,$to) = @_; + + print STDERR " cp $from $to\n"; + print STDERR " creating new version of $to\n" if $Is_VMS and -e $to; + File::Copy::copy($from, $to) + || warn "Couldn't copy $from to $to: $!\n" + unless $nonono; + $packlist->{$to} = { type => 'file' }; } sub samepath { local($p1, $p2) = @_; - local($dev1, $ino1, $dev2, $ino2); + + return (lc($p1) eq lc($p2)) if $Is_W32; if ($p1 ne $p2) { + local($dev1, $ino1, $dev2, $ino2); ($dev1, $ino1) = stat($p1); ($dev2, $ino2) = stat($p2); ($dev1 == $dev2 && $ino1 == $ino2); @@ -334,8 +494,14 @@ sub samepath { sub installlib { my $dir = $File::Find::dir; $dir =~ s#^\.(?![^/])/?##; + local($depth) = $dir ? "lib/$dir" : "lib"; my $name = $_; + + if ($name eq 'CVS' && -d $name) { + $File::Find::prune = 1; + return; + } # ignore patch backups and the .exists files. return if $name =~ m{\.orig$|~$|^\.exists}; @@ -343,7 +509,10 @@ 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 =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) || + ($name =~ /^(.*)\.(?:h|lib)$/i && $Is_W32) + ) { $installlib = $installarchlib; return unless $do_installarchlib; } else { @@ -351,27 +520,23 @@ sub installlib { } if (-f $_) { - if (/\.al$/ || /\.ix$/) { + if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$] && $archpms{$1})) { $installlib = $installprivlib; #We're installing *.al and *.ix files into $installprivlib, #but we have to delete old *.al and *.ix files from the 5.000 #distribution: #This might not work because $archname might have changed. - &unlink("$installarchlib/$name"); + unlink("$installarchlib/$name"); } - system "cmp", "-s", $_, "$installlib/$name"; - if ($?) { - &unlink("$installlib/$name"); + $packlist->{"$installlib/$name"} = { type => 'file' }; + 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"); - } + copy_if_diff($_, "$installlib/$name") + and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444, + "$installlib/$name"); } } elsif (-d $_) { mkpath("$installlib/$name", 1, 0777); @@ -386,18 +551,24 @@ sub installlib { # 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. -sub cp_if_diff { +# Return true if copying occurred. + +sub copy_if_diff { my($from,$to)=@_; + return 1 if (($^O eq 'VMS') && (-d $from)); -f $from || die "$0: $from not found"; - system "cmp", "-s", $from, $to; - if ($?) { - my ($atime, $mtime); - unlink($to); # In case we don't have write permissions. - cmd("cp $from $to"); - # Restore timestamps if it's a .a library. - if ($to =~ /\.a$/) { - ($atime, $mtime) = (stat $from)[8,9]; + $packlist->{$to} = { type => 'file' }; + if (compare($from, $to) || $nonono) { + safe_unlink($to); # In case we don't have write permissions. + if ($nonono) { + $from = $depth . "/" . $from if $depth; + } + copy($from, $to); + # Restore timestamps if it's a .a library or for OS/2. + if (!$nonono && ($Is_OS2 || $to =~ /\.a$/)) { + my ($atime, $mtime) = (stat $from)[8,9]; utime $atime, $mtime, $to; } + 1; } }