From d89f3a1d0863a32597e02beaf1a084bca278f772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20=F0=9F=91=A8=F0=9F=8F=BD=E2=80=8D=F0=9F=92=BB=20Copl?= =?UTF-8?q?an?= Date: Fri, 2 May 2025 14:47:51 -0700 Subject: [PATCH] 53535: fix builds with interactive manpagers --- ChangeLog | 5 +++++ Util/helpfiles | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1dfa62b84..bff0b5146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2025-05-04 dana@dana.is + + * Max Coplan: 53535: Util/helpfiles: fix builds with + interactive manpagers + 2025-05-01 Peter Stephenson * 53529: Test/A04redirect.ztst: Avoid using system area for diff --git a/Util/helpfiles b/Util/helpfiles index 58aa04bba..71db7d2a4 100755 --- a/Util/helpfiles +++ b/Util/helpfiles @@ -57,7 +57,7 @@ $coltmp = $destdir . '/' . $coltmpbase; $args = "./$manfile >$mantmp"; unlink($mantmp); &Info('attempting man ', $args); -if(system('man ' . $args) || !(-s $mantmp)) { +if(system('MANPAGER=cat man ' . $args) || !(-s $mantmp)) { unlink($mantmp); &Info('attempting nroff -man ', $args); if(system('nroff -man ' . $args) || !(-s $mantmp)) {