summaryrefslogtreecommitdiffstats
path: root/doc/Makefile.am
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2017-11-15 11:01:10 +0100
committerWerner Koch <wk@gnupg.org>2017-11-15 11:01:10 +0100
commit091c4af64543cf95d92e09664b5eb1b729782064 (patch)
tree1abe5f5a75a39852e5e78f17efed1d4f86426afe /doc/Makefile.am
parentdirmngr: Check for WKD support at session end (diff)
parentdoc: Add man page for gpgtar (diff)
downloadgnupg2-091c4af64543cf95d92e09664b5eb1b729782064.tar.xz
gnupg2-091c4af64543cf95d92e09664b5eb1b729782064.zip
Merge branch 'STABLE-BRANCH-2-2'
-- Kept our AUTHORS and README
Diffstat (limited to 'doc/Makefile.am')
-rw-r--r--doc/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c0c7fd0b7..21e3e4578 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -91,7 +91,7 @@ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
dirmngr.texi scdaemon.texi tools.texi wks.texi
myman_pages = gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \
watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
- gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
+ gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 gpgtar.1 \
applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \
dirmngr-client.1
if USE_GPG2_HACK
@@ -110,7 +110,7 @@ CLEANFILES = yat2m mkdefsinc defs.inc
DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
gnupg-card-architecture.eps \
gnupg-module-overview.eps \
- $(myman_pages) gpg-zip.1 gnupg.7
+ $(myman_pages) gnupg.7
yat2m: yat2m.c
$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c