Re: [groff] More on stripping

[Bertrand Garrigues]

Hi Peter,

On Fri, Mar 16 2018 at 01:05:17 PM, Peter Schaffter <address@hidden> wrote:
> Ingo --
>
> On Thu, Mar 15, 2018, Ingo Schwarze wrote:
>> After a fierce fight resulting in the death of the vicious
>> git-version-gen dragon, i finally managed to test,
>
> A good fight, St. George. :)
>
>> ...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)
>
> Thanks for catching these.
>  
>> The complete patch that i believe you want to commit is appended
>> at the end for comparison.
>
> Applied, tested, and pushed.

The commit 69c5a52a05efc39388b893d5b4d7cff549b6ab18 breaks the
generation of mom pdf examples when building out of source: we must now
pass mom source dir to -M instead of mom build dir (however if you build
directly in the sources you will not see the problem).

The patch below fixes the problem, could you please test on your side
too?

I've also removed the line:

  nodist_momtmac_DATA = $(MOMNORMALFILES)

this no longer makes any sense as we say just below:

  dist_momtmac_DATA = $(MOMNORMALFILES)

Regards,

Bertrand


diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index a4a74318..ef0f9cf4 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -21,10 +21,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 mom_srcdir = $(top_srcdir)/contrib/mom
-mom_builddir = $(top_builddir)/contrib/mom
 
 # pdfmom command used to generated .pdf
-MOM_TFLAG = -M$(mom_builddir)
+MOM_TFLAG = -M$(mom_srcdir)
 MOM_KFLAG = -k -p -e -t
 MOMPDFMOM = \
   GROFF_COMMAND_PREFIX= \
@@ -40,7 +39,6 @@ MOMNORMALFILES = \
   contrib/mom/mom.tmac \
   contrib/mom/om.tmac
 momtmacdir = $(tmacdir)
-nodist_momtmac_DATA = $(MOMNORMALFILES)
 dist_momtmac_DATA = $(MOMNORMALFILES)
 
 # Files installed in htmldocdir/mom