summaryrefslogtreecommitdiff
path: root/installperl
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2012-04-25 12:47:53 +0200
committerNicholas Clark <nick@ccl4.org>2013-07-13 12:01:37 +0200
commit570f643f365e92afac29fc9b092792d455829e99 (patch)
tree7a5694e679ea09d7f9617bbb0c3ee6ae68760c95 /installperl
parent236818e0b9d9fe874831086b4d0b94dc6f245dfd (diff)
downloadperl-570f643f365e92afac29fc9b092792d455829e99.tar.gz
In installperl, invert the sense of the variable used for the -o option.
Previously it was $otherperls, and had to have its default of 1 explicitly set. Change it to $skip_otherperls, and the default default of undef is perfect.
Diffstat (limited to 'installperl')
-rwxr-xr-xinstallperl7
1 files changed, 3 insertions, 4 deletions
diff --git a/installperl b/installperl
index a3fc6f5743..cf66987d69 100755
--- a/installperl
+++ b/installperl
@@ -14,7 +14,7 @@ use strict;
use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
%opts $packlist);
my ($dostrip, $versiononly, $force,
- $otherperls, $archname, $nwinstall, $nopods);
+ $skip_otherperls, $archname, $nwinstall, $nopods);
BEGIN {
if ($Is_VMS) { eval 'use VMS::Filespec;' }
@@ -65,7 +65,6 @@ if ( $Is_VMS ) {
}
}
-$otherperls = 1;
# This little hack simplifies making the code after the comment "Fetch some
# frequently-used items from %Config" warning free. With $opts{destdir} always
# defined, it's also possible to make the s/\Q$opts{destdir}\E unconditional.
@@ -79,7 +78,7 @@ while (@ARGV) {
$versiononly = 1 if $ARGV[0] eq '-v';
$versiononly = 0 if $ARGV[0] eq '+v';
$opts{silent} = 1 if $ARGV[0] eq '-S';
- $otherperls = 0 if $ARGV[0] eq '-o';
+ $skip_otherperls = 1 if $ARGV[0] eq '-o';
$force = 1 if $ARGV[0] eq '-f';
$opts{verbose} = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
$archname = 1 if $ARGV[0] eq '-A';
@@ -547,7 +546,7 @@ if (!$nopods && (!$versiononly || ($installprivlib =~ m/\Q$vershort/))) {
# Also skip $mainperl if the user opted to have it be a link to the
# installed perl.
-if (!$versiononly && $otherperls) {
+if (!$versiononly && !$skip_otherperls) {
my ($path, @path);
my $dirsep = ($Is_OS2 || $Is_W32 || $Is_NetWare) ? ';' : ':' ;
($path = $ENV{"PATH"}) =~ s:\\:/:g ;