[groff] 02/03: mdoc: Relocate within build tree.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit de1e4091311d74ab2af19aa0d376c5d228a14280
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Aug 25 17:52:55 2020 +1000

    mdoc: Relocate within build tree.
    
    The (modern) mdoc macro package has not been usable within the build
    tree, unlike the others.  This makes it more troublesome to test
    changes, and frustrates deploying our test infrastructure against it.
    Re-arrange the build tree to resemble an installation tree closely
    enough for the macro package to load.
    
        renamed:    doc-common-u -> mdoc/doc-common-u
        renamed:    doc-ditroff-u -> mdoc/doc-ditroff-u
        renamed:    doc-nroff-u -> mdoc/doc-nroff-u
        renamed:    doc-syms-u -> mdoc/doc-syms-u
    
    * tmac/tmac.am (TMACMDOCFILES): Look for files in tmac/mdoc.
      ($(TMACMDOCFILES)): Create tmac/mdoc in build tree.
    
    Fixes <https://savannah.gnu.org/bugs/index.php?51003>.
---
 ChangeLog                     | 25 +++++++++++++++++++++++++
 tmac/{ => mdoc}/doc-common-u  |  0
 tmac/{ => mdoc}/doc-ditroff-u |  0
 tmac/{ => mdoc}/doc-nroff-u   |  0
 tmac/{ => mdoc}/doc-syms-u    |  0
 tmac/tmac.am                  |  9 +++++----
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 379f0ff..0bf0501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
 2020-08-25  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       mdoc: Relocate within build tree.
+
+       The (modern) mdoc macro package has not been usable within the
+       build tree, unlike the others.  This makes it more troublesome
+       to test changes, and frustrates deploying our test
+       infrastructure against it.  Re-arrange the build tree to
+       resemble an installation tree closely enough for the macro
+       package to load.
+
+       * tmac/doc-common-u:
+       * tmac/doc-ditroff-u:
+       * tmac/doc-nroff-u:
+       * tmac/doc-syms-u: Rename to...
+       * tmac/mdoc/doc-common-u:
+       * tmac/mdoc/doc-ditroff-u:
+       * tmac/mdoc/doc-nroff-u:
+       * tmac/mdoc/doc-syms-u: ...these.
+
+       * tmac/tmac.am (TMACMDOCFILES): Look for files in tmac/mdoc.
+       ($(TMACMDOCFILES)): Create tmac/mdoc in build tree.
+
+       Fixes <https://savannah.gnu.org/bugs/index.php?51003>.
+
+2020-08-25  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        Add regression test for usable in-tree mdoc.
 
        * tmac/tests/doc-smoke-test.sh: Add test.
diff --git a/tmac/doc-common-u b/tmac/mdoc/doc-common-u
similarity index 100%
rename from tmac/doc-common-u
rename to tmac/mdoc/doc-common-u
diff --git a/tmac/doc-ditroff-u b/tmac/mdoc/doc-ditroff-u
similarity index 100%
rename from tmac/doc-ditroff-u
rename to tmac/mdoc/doc-ditroff-u
diff --git a/tmac/doc-nroff-u b/tmac/mdoc/doc-nroff-u
similarity index 100%
rename from tmac/doc-nroff-u
rename to tmac/mdoc/doc-nroff-u
diff --git a/tmac/doc-syms-u b/tmac/mdoc/doc-syms-u
similarity index 100%
rename from tmac/doc-syms-u
rename to tmac/mdoc/doc-syms-u
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 3da6e84..f98e354 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -101,10 +101,10 @@ dist_tmac_DATA = $(TMACNORMALFILES) tmac/an.tmac 
tmac/s.tmac
 nodist_tmac_DATA = $(TMACSTRIPFILES) tmac/www.tmac
 
 TMACMDOCFILES = \
-  tmac/doc-common \
-  tmac/doc-ditroff \
-  tmac/doc-nroff \
-  tmac/doc-syms
+  tmac/mdoc/doc-common \
+  tmac/mdoc/doc-ditroff \
+  tmac/mdoc/doc-nroff \
+  tmac/mdoc/doc-syms
 MDOCFILES = `echo $(TMACMDOCFILES) | sed -e "s|tmac/||g"`
 mdocdir=$(tmacdir)/mdoc
 # Files installed in mdocdir
@@ -171,6 +171,7 @@ tmac-dist-hook:
 
 $(TMACMDOCFILES) $(TMACSTRIPFILES): 
        $(MKDIR_P) $(top_builddir)/tmac
+       $(MKDIR_P) $(top_builddir)/tmac/mdoc
        for f in $(TMACMDOCFILES) $(TMACSTRIPFILES); do \
           sed -f $(tmac_srcdir)/strip.sed $(top_srcdir)/$$f-u > 
$(top_builddir)/$$f; \
        done