X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=utils%2Fperldoc.PL;h=ca631dda2b6e18b569f35e16c2e152d92a93374a;hb=16ba52cf04376a6afd806dc9ac35d10e783fbbd1;hp=dc145e3e35ac21f490b1dab7780f0aa20daac45a;hpb=aafed681d129a57a40f6f1dbe3a5794aa1fa2e04;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/utils/perldoc.PL b/utils/perldoc.PL
index dc145e3..ca631dd 100644
--- a/utils/perldoc.PL
+++ b/utils/perldoc.PL
@@ -38,7 +38,7 @@ INIT { eval { umask(0077) } }   # doubtless someone has no mask
 
 my \@pagers = ();
 push \@pagers, "$Config{'pager'}" if -x "$Config{'pager'}";
-my \$bindir = "$Config{installscript}";
+my \$bindir = '$Config{scriptdir}';
 
 !GROK!THIS!
 
@@ -409,7 +409,11 @@ sub page {
     }
     else {
 	foreach my $pager (@pagers) {
-	    last if system("$pager $tmp") == 0;
+          if ($Is_VMS) {
+           last if system("$pager $tmp") == 0; # quoting prevents logical expansion
+          } else {
+	    last if system("$pager \"$tmp\"") == 0;
+          }
 	}
     }
 }
@@ -555,7 +559,10 @@ eval q{
     sub END { cleanup($tmp, $buffer) } 
     1;
 } || die;
-eval q{ use sigtrap qw(die INT TERM HUP QUIT) };
+
+# exit/die in a windows sighandler is dangerous, so let it do the
+# default thing, which is to exit
+eval q{ use sigtrap qw(die INT TERM HUP QUIT) } unless $^O eq 'MSWin32';
 
 if ($opt_m) {
     foreach my $pager (@pagers) {