summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Fresh <afresh1@cvs.openbsd.org>2017-03-04 22:02:17 +0000
committerAndrew Fresh <afresh1@cvs.openbsd.org>2017-03-04 22:02:17 +0000
commit7431bebd9c329c042e19998cae1e3b08a3c262fb (patch)
treeb0837b90be523e7c7a0e146a034cd46cc88e7c7e
parent5bd1e9fa20d0de6dd01e4073c2326c0d51c27049 (diff)
Better avoid installing versioned perl, makes perlivp happy
-rw-r--r--gnu/usr.bin/perl/installperl6
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/usr.bin/perl/installperl b/gnu/usr.bin/perl/installperl
index acd6e2e16fc..452dd2efd8b 100644
--- a/gnu/usr.bin/perl/installperl
+++ b/gnu/usr.bin/perl/installperl
@@ -307,6 +307,7 @@ if ($Is_VMS) {
}
elsif ($^O ne 'dos') {
if (!$Is_NetWare) {
+ my $ver = ''; # don't install a versioned perl binary
install("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext", "0755");
}
else {
@@ -410,14 +411,15 @@ if ($Is_W32) { #linking lib isn't made in root but in CORE on Win32
# 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 && ! $Is_NetWare) {
+if (0) { # don't install a versioned perl binary
+#if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS && ! $Is_NetWare) {
safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext");
if ($^O eq 'vos') {
# VOS doesn't support hard links, so use a symlink.
symlink("$installbin/$perl_verbase$ver$exe_ext",
"$installbin/$perl$exe_ext");
} else {
- safe_rename("$installbin/$perl_verbase$ver$exe_ext",
+ link("$installbin/$perl_verbase$ver$exe_ext",
"$installbin/$perl$exe_ext");
}
}