[groff] 18/35: Makefile.am: Use hyphenation control escapes more.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit d84d9e1d85287b24d14001a6fdcbaa9cfc588d55
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Feb 20 05:21:36 2022 +1100

    Makefile.am: Use hyphenation control escapes more.
    
    * Makefile.am (.man): Prefix hyphenation control escape sequences to
      more configuration-time interpolations to prevent their hyphenation:
      @DEVICE@, @g@, @INDEX_SUFFIX@, @PAGE@, @TMAC_{AN,M,S}_PREFIX@,
      @TMAC_MDIR@.
---
 ChangeLog   |  7 +++++++
 Makefile.am | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4a55ac7..9499348f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-02-20  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * Makefile.am (.man): Prefix hyphenation control escape
+       sequences to more configuration-time interpolations to prevent
+       their hyphenation: @DEVICE@, @g@, @INDEX_SUFFIX@, @PAGE@,
+       @TMAC_{AN,M,S}_PREFIX@, @TMAC_MDIR@.
+
 2022-02-16  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [man]: Refactor `EX` and `EE` macros.
diff --git a/Makefile.am b/Makefile.am
index d3fa426b..483efe46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -894,13 +894,13 @@ SUFFIXES += .man
             -e "s|[@]DATASUBDIR[@]|`echo $(datasubdir) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]DEFAULT_INDEX[@]|`echo $(indexdir)/$(indexname) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]DEFAULT_INDEX_NAME[@]|`echo $(indexname) | sed -f 
$(makevarescape)`|g" \
-            -e "s|[@]DEVICE[@]|$(DEVICE)|g" \
+            -e "s|[@]DEVICE[@]|\\\\%$(DEVICE)|g" \
             -e "s|[@]DOCDIR[@]|`echo $(docdir) | sed -f $(makevarescape)`|g" \
             -e "s|[@]EXAMPLEDIR[@]|`echo $(exampledir) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]FONTDIR[@]|`echo $(fontdir) | sed -f $(makevarescape)`|g" 
\
-            -e "s|[@]g[@]|$(g)|g" \
+            -e "s|[@]g[@]|\\\\%$(g)|g" \
             -e "s|[@]HTMLDOCDIR[@]|`echo $(htmldocdir) | sed -f 
$(makevarescape)`|g" \
-            -e "s|[@]INDEX_SUFFIX[@]|$(indexext)|g" \
+            -e "s|[@]INDEX_SUFFIX[@]|\\\\%$(indexext)|g" \
             -e "s|[@]LEGACYFONTDIR[@]|`echo $(legacyfontdir) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]LOCALFONTDIR[@]|`echo $(localfontdir) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]LOCALMACRODIR[@]|`echo $(localtmacdir) | sed -f 
$(makevarescape)`|g" \
@@ -910,13 +910,13 @@ SUFFIXES += .man
             -e "s|[@]MAN7EXT[@]|$(man7ext)|g" \
             -e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \
             -e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f 
$(makevarescape)`|g" \
-            -e "s|[@]PAGE[@]|$(PAGE)|g" \
+            -e "s|[@]PAGE[@]|\\\\%$(PAGE)|g" \
             -e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f 
$(makevarescape)`|g" \
             -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f 
$(makevarescape)`|g" \
-            -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \
-            -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \
-            -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \
-            -e "s|[@]TMAC_S_PREFIX[@]|$(tmac_s_prefix)|g" \
+            -e "s|[@]TMAC_AN_PREFIX[@]|\\\\%$(tmac_an_prefix)|g" \
+            -e "s|[@]TMAC_M_PREFIX[@]|\\\\%$(tmac_m_prefix)|g" \
+            -e "s|[@]TMAC_MDIR[@]|`echo $(tmacdir) | sed -f 
$(makevarescape)`/mm|g" \
+            -e "s|[@]TMAC_S_PREFIX[@]|\\\\%$(tmac_s_prefix)|g" \
             -e "s|[@]VERSION[@]|$(VERSION)|g" \
             $< \
             >$@