X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=fb16bab0be2a031ece164eb20bfdcafbc4a92860;hb=23bcb45a99d8c34501ff21d6933805d719b9809d;hp=c3c4e4a45ead2e263b39a0eb919fab6168f52266;hpb=60ce24170371608f75fb4b2baa8256ab0dec3383;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index c3c4e4a..fb16bab 100755
--- a/installperl
+++ b/installperl
@@ -72,6 +72,24 @@ while (@ARGV) {
     $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
     $archname = 1 if $ARGV[0] eq '-A';
 	$nwinstall = 1 if $ARGV[0] eq '-netware';
+    if ($ARGV[0] eq '-?' or $ARGV[0] =~ /^-?-h/) {
+      print <<"EOT";
+Usage $0: [switches]
+  -n	    Don't actually run any commands; just print them.
+  -s        Run strip on installed binaries.
+  -v        Only install perl as a binary with the version number in the name.
+            (Override whatever config.sh says)
+  +v        Install perl as "perl" and as a binary with the version number in
+            the name.  (Override whatever config.sh says)
+  -S        Silent mode.
+  -o        Skip checking for other copies of perl in your PATH.
+  -V        Verbose mode.
+  -A        Also install perl with the architecture's name in the perl binary's
+            name.
+  -netware  Install correctly on a Netware server.
+EOT
+      exit;
+    }
     shift;
 }
 
@@ -407,11 +425,7 @@ if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
 	      (-l $usrbinperl) &&
 	      ((readlink $usrbinperl) eq $expinstperl));
     }
-    if ((! $mainperl_is_instperl) &&
-	(yn("Many scripts expect perl to be installed as $usrbinperl.\n" . 
-	     "Do you wish to have $usrbinperl be the same as\n" .
-	     "$expinstperl? [y] ")))
-    {
+    if (! $mainperl_is_instperl) {
 	unlink($usrbinperl);
 	( $Config{'d_link'} eq 'define' &&
 	  eval { CORE::link $instperl, $usrbinperl } )	||