as with tlmgr never user perldoc on w32 in tlmgr2

git-svn-id: svn://tug.org/texlive/trunk@11713 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 8 insertions, 5 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr2.pl b/Master/texmf/scripts/texlive/tlmgr2.pl
index b31e74fca69..60be5935fad 100755
--- a/Master/texmf/scripts/texlive/tlmgr2.pl
+++ b/Master/texmf/scripts/texlive/tlmgr2.pl
@@ -229,11 +229,14 @@ if (!defined($action) || !$action) {
 # installations may lack it also.  We want to use it if we have it, to
 # get ASCII emphasis.
 if ($opts{"help"}) {
-  if (TeXLive::TLUtils::which("perldoc")) {
-    pod2usage(-exitstatus => 0, -verbose => 2);
-  } else {
-    pod2usage(-exitstatus => 0, -verbose => 2, -noperldoc => 1);
-  }
+  # perldoc does ASCII emphasis on the output, so it's nice to use it.
+  # But not all Unix platforms have it, and on Windows our Config.pm
+  # can apparently interfere, so always skip it there.
+  my @noperldoc = ();
+  if (win32() || ! TeXLive::TLUtils::which("perldoc")) {
+    @noperldoc = ("-noperldoc", "1");
+  }
+  pod2usage("-exitstatus" => 0, "-verbose" => 2, @noperldoc);
 }
 
 # unify arguments so that the $action contains paper in all cases