security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

doc: Remove included yat2m and build HTML versions of the man pages.

Browse Source 
* configure.ac (YAT2M): Use standard detection.
* doc/Makefile.am (EXTRA_DIST): Remove yat2m.c.
(CLEANFILES): Ditto.
(yat2m): Remove targets.
(yat2m-stamp): Also build html versions.
This commit is contained in:
Werner Koch 2024-08-19 14:00:26 +02:00
parent 8bef1e2821
commit 60c541f588
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -639,9 +639,7 @@ 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", "./yat2m" ) AC_PATH_PROG(YAT2M, [yat2m], [:])
AC_ARG_VAR(YAT2M, [tool to convert texi to man pages])
AM_CONDITIONAL(HAVE_YAT2M, test -n "$ac_cv_path_YAT2M")
AC_SEARCH_LIBS([strerror],[cposix]) AC_SEARCH_LIBS([strerror],[cposix])
AC_SYS_LARGEFILE AC_SYS_LARGEFILE

14
doc/Makefile.am
View File

@ -41,7 +41,7 @@ EXTRA_DIST = samplekeys.asc mksamplekeys com-certs.pem \
gnupg-card-architecture.png gnupg-card-architecture.pdf \ gnupg-card-architecture.png gnupg-card-architecture.pdf \
FAQ gnupg7.texi mkdefsinc.c defsincdate \ FAQ gnupg7.texi mkdefsinc.c defsincdate \
opt-homedir.texi see-also-note.texi specify-user-id.texi \ 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 trust-values.texi keyformat.txt
BUILT_SOURCES = gnupg-module-overview.png gnupg-module-overview.pdf \ BUILT_SOURCES = gnupg-module-overview.png gnupg-module-overview.pdf \
@ -95,14 +95,11 @@ man_MANS = $(myman_pages) gnupg.7
watchgnupg_SOURCE = gnupg.texi watchgnupg_SOURCE = gnupg.texi
CLEANFILES = yat2m mkdefsinc defs.inc CLEANFILES = mkdefsinc defs.inc
DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \ DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
$(myman_pages) gnupg.7 $(myman_pages) gnupg.7
yat2m: yat2m.c
$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
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) \
-o $@ $(srcdir)/mkdefsinc.c -o $@ $(srcdir)/mkdefsinc.c
@ -138,10 +135,13 @@ yat2m-stamp: $(myman_sources) defs.inc
for file in $(myman_sources) ; do \ for file in $(myman_sources) ; do \
$(YAT2M) $(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 ;\
$(YAT2M) $(YAT2M_OPTIONS) --store --html --gnupgorg \
--date "`cat $$incd 2>/dev/null`" \
`test -f '$$file' || echo '$(srcdir)/'`$$file ;\
done
@mv -f yat2m-stamp.tmp $@ @mv -f yat2m-stamp.tmp $@
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 \