Hi Peter,
Peter Schaffter wrote on Wed, Mar 14, 2018 at 07:36:36PM -0400:
> If om.tmac-u is removed from the sources and replaced
> with om.tmac (unstripped), the attached patch should give us
> what we want.
After a fierce fight resulting in the death of the vicious
git-version-gen dragon, i finally managed to test, and the result
is that that your patch looks good to code inspection and survives
the tests listed below on OpenBSD-current if you add the following
minor details:
* remove "/contrib/mom/om.tmac" from .gitignore
* in mom.am, also remove " contrib/mom/om.tmac-u" from EXTRA_DIST
(or make dist will blow up)
* in mom.am, also remove " contrib/mom/om.tmac" from MOSTLYCLEANFILES
(or people may come to grief after spring cleaning)
The complete patch that i believe you want to commit is appended at
the end for comparison.
Tests done:
* ./bootstrap
* mkdir build; cd build; ../configure
* make
* make dist
* comparison of all build logs before and after; all changes look sane
* build and install OpenBSD package
* compare package build logs before and after; all changes look sane
* OpenBSD groff test suite still works
You may also want to test in-tree make and make dist before commit.
Yours,
Ingo
diff --git a/.gitignore b/.gitignore
index d58329c5..e702a37d 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 12fb5215..a4a74318 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 $@` \
&& 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 $@`
- LANG=C LC_ALL=C \
- sed -f $(top_srcdir)/tmac/strip.sed $(mom_srcdir)/`basename $@`-u > $@;
-
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
