$Config{installusrbinperl}

(maint-5.005 changes #2614 and #2709)

p4raw-link: @2614 on //depot/maint-5.005/perl: 1a7ea3dc058ec00eaafdca08bb949aeed8bce2aa

p4raw-id: //depot/cfgperl@2763

diff --git a/Configure b/Configure
index 2979dab..153b502 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue Feb  2 13:28:17 EET 1999 [metaconfig 3.0 PL70]
+# Generated on Tue Feb  2 13:43:18 EET 1999 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -4524,27 +4524,25 @@ fi
 : determine whether to install perl also as /usr/bin/perl
 
 echo " "
-case "$installusrbinperl" in
-'') if test -d /usr/bin -a "X$installbin" != X/usr/bin; then
+if test -d /usr/bin -a "X$installbin" != X/usr/bin; then
        $cat <<EOM
 Many scripts expect to perl to be installed as /usr/bin/perl.
 I can install the perl you are about to compile also as /usr/bin/perl
 (in addition to $installbin/perl).
 EOM
-       dflt='y'
+       case "$installusrbinperl" in
+       "$undef"|[nN]*) dflt='n';;
+       *)              dflt='y';;
+       esac
        rp="Do you want to install perl as /usr/bin/perl?"
        . ./myread
        case "$ans" in
        [yY]*)  val="$define";;
-       *)      val="$undef";;
+       *)      val="$undef" ;;
        esac
-    fi
-    ;;
-esac
-case "$installusrbinperl" in
-"$undef"|[nN]*)        val="$undef";;
-*)             val="$define";;
-esac
+else
+       val="$undef"
+fi
 set installusrbinperl
 eval $setvar
 

diff --git a/installperl b/installperl
index 7a555fb..979000c 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -256,7 +256,8 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
 
 my $mainperl_is_instperl = 0;
 
-if (!$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR
+if ($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";
     my($instperl)      = "$installbin/$perl$exe_ext";