mkpath("$installarchlib/CORE", 1, 0777);
my @corefiles;
if ($Is_VMS) { # We did core file selection during build
- my $coredir = "lib/$Config{'arch'}/$ver";
+ my $coredir = "lib/$Config{archname}/$ver/CORE";
$coredir =~ tr/./_/;
- @corefiles = map { s|^$coredir/||i; } <$coredir/*.*>;
+ map { s|^$coredir/||i; } @corefiles = <$coredir/*.*>;
}
else {
# [als] hard-coded 'libperl' name... not good!
my $mainperl_is_instperl = 0;
-if ($Config{installusrbinperl} eq 'define' &&
+if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
!$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR
&& -w $mainperldir && ! samepath($mainperldir, $installbin)) {
my($usrbinperl) = "$mainperldir/$perl$exe_ext";
if (! $versiononly) {
safe_unlink("$installscript/pstruct$scr_ext");
- if ($osname eq 'dos' or $Is_VMS or $osname eq 'transit') {
+ if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') {
copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext");
- chmod(0755, "$installscript/pstruct$scr_ext");
} else {
link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext");
}
my($prompt) = @_;
my($answer);
my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
- print $prompt;
+ print STDERR $prompt;
chop($answer = <STDIN>);
$answer = $default if $answer =~ m/^\s*$/;
($answer =~ m/^[yY]/);