diff options
| author | Werner Koch <[email protected]> | 2017-11-20 13:55:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-11-20 13:55:02 +0000 |
| commit | 7143729e65754c66d2baaae49065cefede2a17a3 (patch) | |
| tree | 0ad93da6371aa3ccf1424f34ccd671d643f478e2 | |
| parent | Merge branch 'STABLE-BRANCH-2-2' into master (diff) | |
| download | gnupg-7143729e65754c66d2baaae49065cefede2a17a3.tar.gz gnupg-7143729e65754c66d2baaae49065cefede2a17a3.zip | |
Revert "build: BSD make support for yat2m."
--
This reverts commit e1984969cac06a88c7e6f5e49e5c3104d10a847d
because that was 2.2 only.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | doc/Makefile.am | 12 |
2 files changed, 3 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 8440fd924..29d5580b0 100644 --- a/configure.ac +++ b/configure.ac @@ -611,9 +611,8 @@ AC_PROG_RANLIB AC_CHECK_TOOL(AR, ar, :) AC_PATH_PROG(PERL,"perl") AC_CHECK_TOOL(WINDRES, windres, :) -AC_PATH_PROG(YAT2M, "yat2m") +AC_PATH_PROG(YAT2M, "yat2m", "./yat2m" ) AC_ARG_VAR(YAT2M, [tool to convert texi to man pages]) -AM_CONDITIONAL(HAVE_YAT2M, test -n "$ac_cv_path_YAT2M") AC_ISC_POSIX AC_SYS_LARGEFILE GNUPG_CHECK_USTAR diff --git a/doc/Makefile.am b/doc/Makefile.am index 2537f7200..21e3e4578 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -112,16 +112,8 @@ DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \ gnupg-module-overview.eps \ $(myman_pages) gnupg.7 -if HAVE_YAT2M -YAT2M_CMD = $(YAT2M) -YAT2M_DEP = $(YAT2M) -else -YAT2M_CMD = ./yat2m -YAT2M_DEP = yat2m - yat2m: yat2m.c $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c -endif mkdefsinc: mkdefsinc.c Makefile ../config.h $(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \ @@ -154,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_CMD) $(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_DEP) +yat2m-stamp: $(YAT2M) $(myman_pages) gnupg.7 : yat2m-stamp defs.inc @if test -f $@; then :; else \ |