summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/perl/installperl
diff options
context:
space:
mode:
authorafresh1 <afresh1@openbsd.org>2017-03-04 22:02:16 +0000
committerafresh1 <afresh1@openbsd.org>2017-03-04 22:02:16 +0000
commit0a8a4dd60532f94cb4938c8b8adda9ac1d503378 (patch)
tree881d25bffbdd2afbb4561164e787d2295d4082d3 /gnu/usr.bin/perl/installperl
parentRemove a redundant condition in .%T handling, no functional change. (diff)
downloadwireguard-openbsd-0a8a4dd60532f94cb4938c8b8adda9ac1d503378.tar.xz
wireguard-openbsd-0a8a4dd60532f94cb4938c8b8adda9ac1d503378.zip
Better avoid installing versioned perl, makes perlivp happy
Diffstat (limited to 'gnu/usr.bin/perl/installperl')
-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");
}
}