From 10307c7cd96a305ca962e0778373584da7315b74 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Fri, 7 Feb 2025 23:52:04 -0500 Subject: [PATCH] doc: Do not install gnupg.7.html into usr/share/man/manh/ * doc/Makefile.am: Ship gnupg.7.html with other html, not with manpages. -- Without this change, gnupg.7.html gets placed in /usr/share/manh/ Since it can't be correctly rendered by groff, this is undesirable. Signed-off-by: Daniel Kahn Gillmor --- doc/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 5d55767cd..6889bda1e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -93,9 +93,10 @@ myhtmlman_pages = \ gpgtar.1.html gpg-mail-tube.1.html \ applygnupgdefaults.8.html gpg-wks-client.1.html \ gpg-wks-server.1.html \ - dirmngr-client.1.html gpg-card.1.html gpg-check-pattern.1.html + dirmngr-client.1.html gpg-card.1.html gpg-check-pattern.1.html \ + gnupg.7.html -man_MANS = $(myman_pages) gnupg.7 gnupg.7.html +man_MANS = $(myman_pages) gnupg.7 watchgnupg_SOURCE = gnupg.texi @@ -103,7 +104,7 @@ watchgnupg_SOURCE = gnupg.texi CLEANFILES = yat2m mkdefsinc defs.inc DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \ - $(myman_pages) gnupg.7 gnupg.7.html $(myhtmlman_pages) + $(myman_pages) gnupg.7 $(myhtmlman_pages) yat2m: yat2m.c $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c @@ -152,7 +153,7 @@ yat2m-stamp: $(myman_sources) defs.inc yat2m-stamp: $(YAT2M) -$(myman_pages) $(myhtmlman_pages) gnupg.7 gnupg.7.html : yat2m-stamp defs.inc +$(myman_pages) $(myhtmlman_pages) gnupg.7 : yat2m-stamp defs.inc @if test -f $@; then :; else \ trap 'rm -rf yat2m-stamp yat2m-lock' 1 2 13 15; \ if mkdir yat2m-lock 2>/dev/null; then \