[groff] 01/01: Rename contrib/mom/om.tmac-u to contrib/mom/om.tmac Remove om.tmac from .gitignore. Fix mom.am to install om.tmac unstripped.

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 69c5a52a05efc39388b893d5b4d7cff549b6ab18
Author: Peter Schaffter <address@hidden>
Date:   Fri Mar 16 12:58:59 2018 -0400

    Rename contrib/mom/om.tmac-u to contrib/mom/om.tmac
    Remove om.tmac from .gitignore.
    Fix mom.am to install om.tmac unstripped.
---
 .gitignore                         |  1 -
 contrib/mom/mom.am                 | 18 ++++--------------
 contrib/mom/{om.tmac-u => om.tmac} |  0
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index d58329c..e702a37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ stamp-*
 /chem
 /contrib/hdtbl/hdmisc.tmac
 /contrib/hdtbl/hdtbl.tmac
-/contrib/mom/om.tmac
 /defs.h
 /eqn
 /eqn2graph
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 12fb521..a4a7431 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -36,14 +36,11 @@ man7_MANS += contrib/mom/groff_mom.7
 
 # Files installed in $(tmacdir).
 # MOMNORMALFILES are located in the source tree.
-# om.tmac is generated in the build tree from the unstripped file om.tmac-u 
with
-#  strip.sed
 MOMNORMALFILES = \
-  contrib/mom/mom.tmac
-MOMSTRIPFILES = \
+  contrib/mom/mom.tmac \
   contrib/mom/om.tmac
 momtmacdir = $(tmacdir)
-nodist_momtmac_DATA = $(MOMSTRIPFILES)
+nodist_momtmac_DATA = $(MOMNORMALFILES)
 dist_momtmac_DATA = $(MOMNORMALFILES)
 
 # Files installed in htmldocdir/mom
@@ -121,12 +118,10 @@ EXTRA_DIST += $(MOMHTMLDOCFILES) $(MOMEXAMPLEFILES) \
   contrib/mom/NEWS \
   contrib/mom/TODO \
   contrib/mom/copyright \
-  contrib/mom/groff_mom.7.man \
-  contrib/mom/om.tmac-u
+  contrib/mom/groff_mom.7.man
 
 MOSTLYCLEANFILES += \
   $(MOMPROCESSEDEXAMPLEFILES) \
-  contrib/mom/om.tmac \
   penguin.ps \
   penguin.pdf
 
@@ -136,7 +131,7 @@ SUFFIXES += .mom .pdf
        $(GROFF_V)$(MKDIR_P) `dirname address@hidden \
        && LC_ALL=C $(MOMPDFMOM) $< >$@
 
-$(MOMPROCESSEDEXAMPLEFILES): $(MOMSTRIPFILES) $(MOMNORMALFILES) \
+$(MOMPROCESSEDEXAMPLEFILES): $(MOMNORMALFILES) \
   groff troff gropdf pdfmom penguin.ps penguin.pdf \
   gnu.eps font/devpdf/build_font_files
 
@@ -145,11 +140,6 @@ penguin.ps:
 penguin.pdf:
        cp $(mom_srcdir)/examples/penguin.pdf $@
 
-$(MOMSTRIPFILES): $(top_srcdir)/tmac/strip.sed
-       @$(MKDIR_P) `dirname address@hidden
-       LANG=C LC_ALL=C \
-       sed -f $(top_srcdir)/tmac/strip.sed $(mom_srcdir)/`basename 
address@hidden > $@;
-
 install-data-hook: install_mom
 install_mom:
 if BUILD_PDFEXAMPLES
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac
similarity index 100%
rename from contrib/mom/om.tmac-u
rename to contrib/mom/om.tmac