security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Revert "build: BSD make support for yat2m."

Browse Source 
--
This reverts commit e1984969cac06a88c7e6f5e49e5c3104d10a847d
because that was 2.2 only.
This commit is contained in:
Werner Koch 2017-11-20 14:55:02 +01:00
parent 668f6c3de6
commit 7143729e65
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -611,9 +611,8 @@ AC_PROG_RANLIB
AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(AR, ar, :)
AC_PATH_PROG(PERL,"perl") AC_PATH_PROG(PERL,"perl")
AC_CHECK_TOOL(WINDRES, windres, :) 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]) 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_ISC_POSIX
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
GNUPG_CHECK_USTAR GNUPG_CHECK_USTAR

12
doc/Makefile.am
View File

@ -112,16 +112,8 @@ DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
gnupg-module-overview.eps \ gnupg-module-overview.eps \
$(myman_pages) gnupg.7 $(myman_pages) gnupg.7
if HAVE_YAT2M
YAT2M_CMD = $(YAT2M)
YAT2M_DEP = $(YAT2M)
else
YAT2M_CMD = ./yat2m
YAT2M_DEP = yat2m
yat2m: yat2m.c yat2m: yat2m.c
$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
endif
mkdefsinc: mkdefsinc.c Makefile ../config.h mkdefsinc: mkdefsinc.c Makefile ../config.h
$(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \ $(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \
@ -154,12 +146,12 @@ yat2m-stamp: $(myman_sources) defs.inc
@touch yat2m-stamp.tmp @touch yat2m-stamp.tmp
incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \ incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
for file in $(myman_sources) ; do \ for file in $(myman_sources) ; do \
$(YAT2M_CMD) $(YAT2M_OPTIONS) --store \ $(YAT2M) $(YAT2M_OPTIONS) --store \
--date "`cat $$incd 2>/dev/null`" \ --date "`cat $$incd 2>/dev/null`" \
`test -f '$$file' || echo '$(srcdir)/'`$$file ; done `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
@mv -f yat2m-stamp.tmp $@ @mv -f yat2m-stamp.tmp $@
yat2m-stamp: $(YAT2M_DEP) yat2m-stamp: $(YAT2M)
$(myman_pages) gnupg.7 : yat2m-stamp defs.inc $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
@if test -f $@; then :; else \ @if test -f $@; then :; else \