[groff] 03/11: doc/doc.am: Refactor to stop groffing stdin.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 57a58e99ff833cf2c8f182eb0e96f4293e44e5ec
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Apr 6 01:03:35 2022 +1000

    doc/doc.am: Refactor to stop groffing stdin.
    
    * doc/doc.am: Refactor.
      (doc/pic.html, doc/webpage.html): Drop indirection of source document
      through `DOC_SED` macro.  It was not necessary since neither of these
      documents are parameterized in configuration options (that is, they
      don't contain @VERSION@ or @g@).
    
    Thanks to Ingo Schwarze for the discussion.
---
 ChangeLog  |  8 ++++++++
 doc/doc.am | 16 +++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d536271..0e4ee7eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,14 @@
        (uninstall-html): Drop superfluous `-r` flag; we're only
        deleting files with this command, not directories.
 
+2022-04-05  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * doc/doc.am: Refactor.
+       (doc/pic.html, doc/webpage.html): Drop indirection of source
+       document through `DOC_SED` macro.  It was not necessary since
+       neither of these documents are parameterized in configuration
+       options (that is, they don't contain @VERSION@ or @g@).
+
 2022-04-05  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/doc.am: Trivially refactor.
diff --git a/doc/doc.am b/doc/doc.am
index 0968be31..0998d8c9 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -339,11 +339,8 @@ doc/pic.html: $(devhtmlfont_DATA)
 doc/pic.html: $(doc_srcdir)/pic.ms
        $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
        && cd $(doc_builddir) \
-       && nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
-         $(DOC_SED) -e "1i\\$$nl.lf 1 $(doc_srcdir)/pic.ms$$nl" \
-         $(doc_srcdir)/pic.ms \
-          | $(DOC_GROFF_ONLY) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \
-          > pic.html
+       && $(DOC_GROFF_ONLY) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \
+         $(doc_srcdir)/pic.ms > pic.html
 
 doc/webpage.html: tmac/www.tmac
 doc/webpage.html: $(bin_PROGRAMS) $(prefixexecbin_PROGRAMS)
@@ -354,12 +351,9 @@ doc/webpage.html: $(DOC_GNU_EPS) $(doc_srcdir)/groff.css
 doc/webpage.html: $(doc_srcdir)/webpage.ms
        $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
        && cd $(doc_builddir) \
-       && nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
-         $(DOC_SED) -e "1i\\$$nl.lf 1 $(doc_srcdir)/webpage.ms$$nl" \
-         $(doc_srcdir)/webpage.ms \
-          | $(DOC_GROFF_ONLY) -t -I $(doc_builddir) -I $(doc_srcdir) \
-            -P-jwebpage -P-nrb -P-Iwebpage -P-Dimg -Thtml -ms \
-            > webpage.html
+       && $(DOC_GROFF_ONLY) -t -I $(doc_builddir) -I $(doc_srcdir) \
+         -P-jwebpage -P-nrb -P-Iwebpage -P-Dimg -Thtml -ms \
+         $(doc_srcdir)/webpage.ms > webpage.html
 
 # We remove groff.css only from an out-of-source build tree.
 mostlyclean-local: mostlyclean_doc