diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 928f8b49c..c8999d923 100644 --- a/configure.ac +++ b/configure.ac @@ -639,9 +639,7 @@ 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]) -AM_CONDITIONAL(HAVE_YAT2M, test -n "$ac_cv_path_YAT2M") +AC_PATH_PROG(YAT2M, [yat2m], [:]) AC_SEARCH_LIBS([strerror],[cposix]) AC_SYS_LARGEFILE diff --git a/doc/Makefile.am b/doc/Makefile.am index fad425db7..69f44465f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -41,7 +41,7 @@ EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem \ gnupg-card-architecture.png gnupg-card-architecture.pdf \ FAQ gnupg7.texi mkdefsinc.c defsincdate \ opt-homedir.texi see-also-note.texi specify-user-id.texi \ - gpgv.texi yat2m.c ChangeLog-2011 whats-new-in-2.1.txt \ + gpgv.texi ChangeLog-2011 whats-new-in-2.1.txt \ trust-values.texi keyformat.txt BUILT_SOURCES = gnupg-module-overview.png gnupg-module-overview.pdf \ @@ -95,14 +95,11 @@ man_MANS = $(myman_pages) gnupg.7 watchgnupg_SOURCE = gnupg.texi -CLEANFILES = yat2m mkdefsinc defs.inc +CLEANFILES = mkdefsinc defs.inc DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \ $(myman_pages) gnupg.7 -yat2m: yat2m.c - $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c - mkdefsinc: mkdefsinc.c Makefile ../config.h $(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \ -o $@ $(srcdir)/mkdefsinc.c @@ -138,10 +135,13 @@ yat2m-stamp: $(myman_sources) defs.inc for file in $(myman_sources) ; do \ $(YAT2M) $(YAT2M_OPTIONS) --store \ --date "`cat $$incd 2>/dev/null`" \ - `test -f '$$file' || echo '$(srcdir)/'`$$file ; done + `test -f '$$file' || echo '$(srcdir)/'`$$file ;\ + $(YAT2M) $(YAT2M_OPTIONS) --store --html --gnupgorg \ + --date "`cat $$incd 2>/dev/null`" \ + `test -f '$$file' || echo '$(srcdir)/'`$$file ;\ + done @mv -f yat2m-stamp.tmp $@ -yat2m-stamp: $(YAT2M) $(myman_pages) gnupg.7 : yat2m-stamp defs.inc @if test -f $@; then :; else \ |