aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-07-05 08:49:13 +0000
committerWerner Koch <[email protected]>2017-07-05 09:01:36 +0000
commitf6faa058749846de18cb34f1cc79867bb0029922 (patch)
tree2e385e6a34fc3f0c88137ab9ad9aa2dbe165a0a4
parentdoc: Document obsolete option in gpgsm. Closes T2231. (diff)
downloadgnupg-f6faa058749846de18cb34f1cc79867bb0029922.tar.gz
gnupg-f6faa058749846de18cb34f1cc79867bb0029922.zip
doc: Prefer an installed version of yat2m
* configure.ac (YAT2M): Check for tool. * doc/Makefile.am (yat2m-stamp): Use installed tool if possible. --
Diffstat (limited to '')
-rw-r--r--configure.ac2
-rw-r--r--doc/Makefile.am4
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 5ab8a53b1..56cb78e52 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 0c7828497..1fa04b412 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 \