shift;
}
-umask 022 unless $Is_VMS;
-
my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc
- utils/pl2pm utils/splain utils/perlcc
+ utils/pl2pm utils/splain utils/perlcc utils/dprofpp
x2p/s2p x2p/find2perl
pod/pod2man pod/pod2html pod/pod2latex pod/pod2text
pod/pod2usage pod/podchecker pod/podselect);
# Shared library and dynamic loading suffixes.
my $so = $Config{so};
my $dlext = $Config{dlext};
+my $dlsrc = $Config{dlsrc};
my $d_dosuid = $Config{d_dosuid};
my $binexp = $Config{binexp};
};
} else {
$perldll = 'perl.' . $dlext;
- $perldll = 'perlcore.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i;
+ $perldll = 'perl56.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i;
}
--f $perldll || die "No perl DLL built\n";
-
+ if ($dlsrc ne "dl_none.xs") {
+ -f $perldll || die "No perl DLL built\n";
+ }
# Install the DLL
-safe_unlink("$installbin/$perldll");
-copy("$perldll", "$installbin/$perldll");
-chmod(0755, "$installbin/$perldll");
-}
+ safe_unlink("$installbin/$perldll");
+ copy("$perldll", "$installbin/$perldll");
+ chmod(0755, "$installbin/$perldll");
+
+} # if ($Is_W32 or $Is_Cygwin)
# This will be used to store the packlist
my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
}
}
-# Install pod pages. Where? I guess in $installprivlib/pod.
+# Install pod pages. Where? I guess in $installprivlib/pod
+# ($installprivlib/pods for cygwin).
+my $pod = $Is_Cygwin ? 'pods' : 'pod';
unless ( $versiononly && !($installprivlib =~ m/\Q$]/)) {
- mkpath("${installprivlib}/pod", 1, 0777);
+ mkpath("${installprivlib}/$pod", 1, 0777);
# If Perl 5.003's perldiag.pod is there, rename it.
- if (open POD, "${installprivlib}/pod/perldiag.pod") {
+ 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";
+ my ($from, $to) = ("${installprivlib}/$pod/perldiag.pod",
+ "${installprivlib}/$pod/perldiag-5.003.pod");
+ print " rename $from $to";
rename($from, $to)
or warn "Couldn't rename $from to $to: $!\n"
unless $nonono;
}
}
- foreach my $file (@pods) {
- # $file is a name like pod/perl.pod
- copy_if_diff($file, "${installprivlib}/${file}");
+ for (@pods) {
+ # $_ is a name like pod/perl.pod
+ (my $base = $_) =~ s#.*/##;
+ copy_if_diff($_, "${installprivlib}/$pod/${base}");
}
}
}
}
my @otherperls;
+ my %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");
+ my $otherperl = "$_/$perl$exe_ext";
+ next if $otherperls{$otherperl}++;
+ push(@otherperls, $otherperl)
+ if (-x $otherperl && ! -d $otherperl);
}
if (@otherperls) {
print STDERR "\nWarning: $perl appears in your path in the following " .
}
$packlist->write() unless $nonono;
-print STDERR " Installation complete\n";
+print " Installation complete\n";
exit 0;
my($prompt) = @_;
my($answer);
my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
- print STDERR $prompt;
+ print $prompt;
chop($answer = <STDIN>);
$answer = $default if $answer =~ m/^\s*$/;
($answer =~ m/^[yY]/);
foreach my $name (@names) {
next unless -e $name;
chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin);
- print STDERR " unlink $name\n";
+ print " unlink $name\n";
( CORE::unlink($name) and ++$cnt
or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
}
foreach my $name (@names) {
next unless -e $name;
chmod 0777, $name if ($Is_OS2 || $Is_W32);
- print STDERR " unlink $name\n";
+ print " unlink $name\n";
next if CORE::unlink($name);
warn "Couldn't unlink $name: $!\n";
if ($! =~ /busy/i) {
- print STDERR " mv $name $name.old\n";
+ print " mv $name $name.old\n";
safe_rename($name, "$name.old")
or warn "Couldn't rename $name: $!\n";
}
my($from,$to) = @_;
my($success) = 0;
- print STDERR " ln $from $to\n";
+ print " ln $from $to\n";
eval {
CORE::link($from, $to)
? $success++
$packlist->{$to} = { from => $from, type => 'link' };
};
if ($@) {
- print STDERR " creating new version of $to\n" if $Is_VMS and -e $to;
+ print " 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"
my($mode,$name) = @_;
return if ($^O eq 'dos');
- printf STDERR " chmod %o %s\n", $mode, $name;
+ printf " chmod %o %s\n", $mode, $name;
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;
+ print " cp $from $to\n";
+ print " 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;
my $name = $_;
- if ($name eq 'CVS' && -d $name) {
+ # Ignore RCS and CVS directories.
+ if (($name eq 'CVS' or $name eq 'RCS') and -d $name) {
$File::Find::prune = 1;
return;
}
- # ignore patch backups and the .exists files.
- return if $name =~ m{\.orig$|~$|^\.exists};
+ # ignore patch backups, RCS files, emacs backup & temp files and the
+ # .exists files.
+ return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists};
$name = "$dir/$name" if $dir ne '';
foreach my $file (@args) {
if (-f $file) {
- print STDERR " strip $file\n";
+ print " strip $file\n";
system("strip", @opts, $file);
} else {
- print STDERR "# file '$file' skipped\n";
+ print "# file '$file' skipped\n";
}
}
}