[groff] 53/78: [build, man]: Fix Savannah #63924.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-04-07
in repository groff.

commit 9802ebbde48a15fec2d3dbeafee1e5e2abc03228
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Mar 14 18:57:37 2023 -0500

    [build, man]: Fix Savannah #63924.
    
    * tmac/tmac.am (tmac/stamp-wrap): Stop prepending groff's man(7) package
      wrapper ("-man") on hosts with a system man package with a request to
      source itself; this was search-and-replace damage from resolving
      Savannah #60789.  The wrapper still worked, but reported any errors
      inside the wrapped macro package many times until the process ran out
      of file descriptors.  Problem introduced by me in commit fdac25937f,
      2021-07-05.
    
    Fixes <https://savannah.gnu.org/bugs/?63924>.
    
    Discovered while testing on Solaris 10.
---
 ChangeLog    | 12 ++++++++++++
 tmac/tmac.am |  3 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4fc0dfb7..8491326b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-03-14  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/tmac.am (tmac/stamp-wrap): Stop prepending groff's man(7)
+       package wrapper ("-man") on hosts with a system man package with
+       a request to source itself; this was search-and-replace damage
+       from resolving Savannah #60789.  The wrapper still worked, but
+       reported any errors inside the wrapped macro package many times
+       until the process ran out of file descriptors.  Problem
+       introduced by me in commit fdac25937f, 2021-07-05.
+
+       Fixes <https://savannah.gnu.org/bugs/?63924>.
+
 2023-04-01  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [gropdf]: Add support for "--help" option to pdfmom.
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 5ef8fe93c..f84ad3052 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -305,9 +305,6 @@ tmac/stamp-wrap:
        $(AM_V_at)if test -n "$(tmac_wrap)"; then \
          for m in ""$(tmac_wrap); do \
            $(RM) $(top_builddir)/tmac/$$m-wrap; \
-           if test "$$m" = an; then \
-             echo .do mso an.tmac >>$(top_builddir)/tmac/$$m-wrap; \
-           fi; \
            echo .cp 1 >>$(top_builddir)/tmac/$$m-wrap; \
            echo .so $(sys_tmac_prefix)$$m \
              >>$(top_builddir)/tmac/$$m-wrap; \