[groff] 04/05: tmac/tmac.am: Fix Savannah #59186.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 00bccfc7418ef7d55ddbf527af0f50c64bb76fa7
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Sep 27 11:52:09 2020 +1000

    tmac/tmac.am: Fix Savannah #59186.
    
    * tmac/tmac.am: Fix problem with recently-relocated mdoc macro files not
      ending up in the right place in the distribution archive.
    
      (dist_tmac_DATA): Also include $(TMACUNSTRIPFILES).
    
      (TMACMDOCSTRIPFILES): Rename from $(TMACMDOCFILES).  Update
      interpolation sites.
    
      (TMACMDOCUNSTRIPFILES): New variable holds mdoc macro files in the
      tmac/mdoc subdirectory.  Stop adding these files to
      $(TMACUNSTRIPFILES) since those reside in tmac/ directly.
    
      (EXTRA_DIST): Add $(TMACMDOCUNSTRIPFILES).
    
      ($(TMACSTRIPFILES)): Depend only on $(TMACUNSTRIPFILES).
    
      ($(TMACMDOCSTRIPFILES)): Add new rule, much like the foregoing.
      Depend on $(TMACMDOCUNSTRIPFILES) and copy files into tmac/mdoc.
    
      (dist-hook, tmac-dist-hook): Remove; they no longer do any distinct
      work.
    
    Fixes <https://savannah.gnu.org/bugs/index.php?59186>.
---
 ChangeLog    | 20 ++++++++++++++++++++
 tmac/tmac.am | 37 ++++++++++++++++++++++---------------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 48903f6..153910e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2020-09-27  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/tmac.am: Fix problem with recently-relocated mdoc macro
+       files not ending up in the right place in the distribution
+       archive.
+       (dist_tmac_DATA): Also include $(TMACUNSTRIPFILES).
+       (TMACMDOCSTRIPFILES): Rename from $(TMACMDOCFILES).  Update
+       interpolation sites.
+       (TMACMDOCUNSTRIPFILES): New variable holds mdoc macro files in
+       the tmac/mdoc subdirectory.  Stop adding these files to
+       $(TMACUNSTRIPFILES) since those reside in tmac/ directly.
+       (EXTRA_DIST): Add $(TMACMDOCUNSTRIPFILES).
+       ($(TMACSTRIPFILES)): Depend only on $(TMACUNSTRIPFILES).
+       ($(TMACMDOCSTRIPFILES)): Add new rule, much like the foregoing.
+       Depend on $(TMACMDOCUNSTRIPFILES) and copy files into tmac/mdoc.
+       (dist-hook, tmac-dist-hook): Remove; they no longer do any
+       distinct work.
+
+       Fixes <https://savannah.gnu.org/bugs/index.php?59186>.
+
 2020-09-26  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/preproc/tbl/table.cpp (table::init_output):
diff --git a/tmac/tmac.am b/tmac/tmac.am
index f685dea..8b383df 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -92,32 +92,39 @@ TMACNORMALFILES = \
   tmac/ja.tmac \
   tmac/zh.tmac
 
-# TMACSTRIPFILES are built from their unstripped version (-u)
+# TMACSTRIPFILES are built from their unstripped version (-u).
 TMACUNSTRIPFILES = tmac/e.tmac-u tmac/doc.tmac-u tmac/doc-old.tmac-u
 TMACSTRIPFILES = tmac/e.tmac tmac/doc.tmac tmac/doc-old.tmac
 
-# Files installed in tmacdir
-dist_tmac_DATA = $(TMACNORMALFILES) tmac/an.tmac tmac/s.tmac
+# files installed in tmacdir
+#
+# "s" and "an" are not "NORMAL" because they may use compatibility
+# wrappers; see install_tmac_wrap_hook.
+dist_tmac_DATA = \
+  $(TMACNORMALFILES) \
+  $(TMACUNSTRIPFILES) \
+  tmac/an.tmac \
+  tmac/s.tmac
 nodist_tmac_DATA = $(TMACSTRIPFILES) tmac/www.tmac
 
-TMACMDOCFILES = \
+TMACMDOCSTRIPFILES = \
   tmac/mdoc/doc-common \
   tmac/mdoc/doc-ditroff \
   tmac/mdoc/doc-nroff \
   tmac/mdoc/doc-syms
-TMACUNSTRIPFILES += \
+TMACMDOCUNSTRIPFILES = \
   tmac/mdoc/doc-common-u \
   tmac/mdoc/doc-ditroff-u \
   tmac/mdoc/doc-nroff-u \
   tmac/mdoc/doc-syms-u
 mdocdir=$(tmacdir)/mdoc
 # Files installed in mdocdir
-nodist_mdoc_DATA = $(TMACMDOCFILES)
+nodist_mdoc_DATA = $(TMACMDOCSTRIPFILES)
 
 # Installed in localtmacdir
 dist_localtmac_DATA = tmac/man.local tmac/mdoc.local
 
-MOSTLYCLEANFILES += $(TMACMDOCFILES) \
+MOSTLYCLEANFILES += $(TMACMDOCSTRIPFILES) \
    $(TMACSTRIPFILES) \
    tmac/groff_man.7.man \
    tmac/groff_man_style.7.man \
@@ -127,6 +134,7 @@ MOSTLYCLEANFILES += $(TMACMDOCFILES) \
    tmac/*-wrap
 
 EXTRA_DIST += \
+  $(TMACMDOCUNSTRIPFILES) \
   tmac/fixmacros.sed \
   tmac/groff_ms.7.man \
   tmac/groff_man.7.man.in \
@@ -170,17 +178,16 @@ tmac_XFAIL_TESTS = \
   tmac/tests/an-ext_UE_punct_hyphenates.sh
 XFAIL_TESTS += $(tmac_XFAIL_TESTS)
 
-dist-hook: tmac-dist-hook
-tmac-dist-hook:
-       chmod u+w $(distdir)/tmac
-       for f in $(TMACMDOCFILES) $(TMACSTRIPFILES); do \
-         cp -f $(top_srcdir)/$$f-u $(distdir)/tmac; \
+
+$(TMACSTRIPFILES): $(TMACUNSTRIPFILES)
+       for f in $(TMACSTRIPFILES); do \
+          sed -f $(tmac_srcdir)/strip.sed $(top_srcdir)/$$f-u \
+            > $(top_builddir)/$$f; \
        done
 
-$(TMACMDOCFILES) $(TMACSTRIPFILES): $(TMACUNSTRIPFILES)
-       $(MKDIR_P) $(top_builddir)/tmac
+$(TMACMDOCSTRIPFILES): $(TMACMDOCUNSTRIPFILES)
        $(MKDIR_P) $(top_builddir)/tmac/mdoc
-       for f in $(TMACMDOCFILES) $(TMACSTRIPFILES); do \
+       for f in $(TMACMDOCSTRIPFILES); do \
           sed -f $(tmac_srcdir)/strip.sed $(top_srcdir)/$$f-u \
             > $(top_builddir)/$$f; \
        done