[Pkg-gnupg-commit] [gnupg2] 80/185: doc: Prefer an installed version of yat2m

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit f6faa058749846de18cb34f1cc79867bb0029922
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 5 10:49:13 2017 +0200

    doc: Prefer an installed version of yat2m
    
    * configure.ac (YAT2M): Check for tool.
    * doc/Makefile.am (yat2m-stamp): Use installed tool if possible.
    --
---
 configure.ac    | 2 ++
 doc/Makefile.am | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5ab8a53..56cb78e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,6 +605,8 @@ AC_PROG_RANLIB
 AC_CHECK_TOOL(AR, ar, :)
 AC_PATH_PROG(PERL,"perl")
 AC_CHECK_TOOL(WINDRES, windres, :)
+AC_PATH_PROG(YAT2M, "yat2m", "./yat2m" )
+AC_ARG_VAR(YAT2M, [tool to convert texi to man pages])
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
 GNUPG_CHECK_USTAR
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0c78284..1fa04b4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -146,12 +146,12 @@ yat2m-stamp: $(myman_sources) defs.inc
 	@touch yat2m-stamp.tmp
 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
 	for file in $(myman_sources) ; do \
-              ./yat2m $(YAT2M_OPTIONS) --store \
+              $(YAT2M) $(YAT2M_OPTIONS) --store \
                   --date "`cat $$incd 2>/dev/null`" \
 	          `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
 	@mv -f yat2m-stamp.tmp $@
 
-yat2m-stamp: yat2m
+yat2m-stamp: $(YAT2M)
 
 $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
 	@if test -f $@; then :; else \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git