--enable-gpg-is-gpg2 option of configure is broken with 2.4.6

Hello,

--enable-gpg-is-gpg2 option of configure is broken with 2.4.6. If the
script is invoked with the option, then `make install` fails as
following.

make[4]: Entering directory '/usr0/tmp/gnupg-2.4.6/doc'
incd="`test -f defsincdate || echo './'`defsincdate"; \
for file in gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi dirmngr.texi scdaemon.texi tools.texi wks.texi gpg-card.texi; do \
              ./yat2m  -I . --release "GnuPG 2.4.6" --source "GNU Privacy Guard 2.4" --store \
                  --date "`cat $incd 2>/dev/null`" \
          `test -f '$file' || echo './'`$file ; \
              ./yat2m  -I . --release "GnuPG 2.4.6" --source "GNU Privacy Guard 2.4" --store --html --gnupgorg \
                  --date "`cat $incd 2>/dev/null`" \
          `test -f '$file' || echo './'`$file ;\
        done
yat2m: writing 'gnupg.7'
yat2m: writing 'gnupg.7'
yat2m: writing 'gpg2.1'
yat2m: writing 'gpg2.1'
yat2m: writing 'gpgsm.1'
yat2m: writing 'gpgsm.1'
yat2m: writing 'gpg-agent.1'
yat2m: writing 'gpg-agent.1'
yat2m: writing 'dirmngr.8'
yat2m: writing 'dirmngr.8'
yat2m: writing 'scdaemon.1'
yat2m: writing 'scdaemon.1'
yat2m: writing 'watchgnupg.1'
yat2m: writing 'gpgv2.1'
yat2m: writing 'addgnupghome.8'
yat2m: writing 'gpgconf.1'
yat2m: writing 'applygnupgdefaults.8'
yat2m: writing 'gpg-preset-passphrase.1'
yat2m: writing 'gpg-connect-agent.1'
yat2m: writing 'dirmngr-client.1'
yat2m: writing 'gpgparsemail.1'
yat2m: writing 'gpgtar.1'
yat2m: writing 'gpg-mail-tube.1'
yat2m: writing 'gpg-check-pattern.1'
yat2m: writing 'watchgnupg.1'
yat2m: writing 'gpgv2.1'
yat2m: writing 'addgnupghome.8'
yat2m: writing 'gpgconf.1'
yat2m: writing 'applygnupgdefaults.8'
yat2m: writing 'gpg-preset-passphrase.1'
yat2m: writing 'gpg-connect-agent.1'
yat2m: writing 'dirmngr-client.1'
yat2m: writing 'gpgparsemail.1'
yat2m: writing 'gpgtar.1'
yat2m: writing 'gpg-mail-tube.1'
yat2m: writing 'gpg-check-pattern.1'
yat2m: writing 'gpg-wks-client.1'
yat2m: writing 'gpg-wks-server.1'
yat2m: writing 'gpg-wks-client.1'
yat2m: writing 'gpg-wks-server.1'
yat2m: writing 'gpg-card.1'
yat2m: writing 'gpg-card.1'
make[4]: Leaving directory '/usr0/tmp/gnupg-2.4.6/doc'
 /bin/mkdir -p '/usr0/tmp/gnupg/usr/local/share/man/man1'
 /bin/install -c -m 644 ./gpg.1 ./gpgv.1 gpgsm.1 gpg-agent.1 scdaemon.1 watchgnupg.1 gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 gpgparsemail.1 gpgtar.1 gpg-mail-tube.1 gpg-wks-client.1 gpg-wks-server.1 dirmngr-client.1 gpg-card.1 gpg-check-pattern.1 '/usr0/tmp/gnupg/usr/local/share/man/man1'
/bin/install: cannot stat './gpg.1': No such file or directory
/bin/install: cannot stat './gpgv.1': No such file or directory
make[3]: *** [Makefile:725: install-man1] Error 1
make[3]: Leaving directory '/usr0/tmp/gnupg-2.4.6/doc'
make[2]: *** [Makefile:999: install-am] Error 2
make[2]: Leaving directory '/usr0/tmp/gnupg-2.4.6/doc'
make[1]: *** [Makefile:992: install] Error 2
make[1]: Leaving directory '/usr0/tmp/gnupg-2.4.6/doc'
make: *** [Makefile:631: install-recursive] Error 1

And attacheed patch fixes the issue.

Regards.

---
Yasuhiro Kimura

_______________________________________________
Gnupg-devel mailing list
[email protected]
https://lists.gnupg.org/mailman/listinfo/gnupg-devel

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5d55767cd..9ba0dd740 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -79,14 +79,13 @@ YAT2M_OPTIONS = -I $(srcdir) \
 myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
 	        dirmngr.texi scdaemon.texi tools.texi wks.texi \
                 gpg-card.texi
-myman_pages   = gpg.1 gpgv.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 \
+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 gpgtar.1 gpg-mail-tube.1 \
 		applygnupgdefaults.8 gpg-wks-client.1 gpg-wks-server.1 \
 		dirmngr-client.1 gpg-card.1 gpg-check-pattern.1
 myhtmlman_pages = \
-                gpg.1.html gpgv.1.html gpgsm.1.html \
-                gpg-agent.1.html dirmngr.8.html scdaemon.1.html \
+                gpgsm.1.html gpg-agent.1.html dirmngr.8.html scdaemon.1.html \
                 watchgnupg.1.html gpgconf.1.html addgnupghome.8.html \
                 gpg-preset-passphrase.1.html \
 		gpg-connect-agent.1.html gpgparsemail.1.html \
@@ -95,7 +94,15 @@ myhtmlman_pages = \
                 gpg-wks-server.1.html \
 		dirmngr-client.1.html gpg-card.1.html gpg-check-pattern.1.html
 
-man_MANS = $(myman_pages) gnupg.7 gnupg.7.html
+if USE_GPG2_HACK
+myman_pages += gpg2.1 gpgv2.1
+myhtmlman_pages += gpg2.1.html gpgv2.1.html
+else
+myman_pages += gpg.1 gpgv.1
+myhtmlman_pages += gpg.1.html gpgv.1.html
+endif
+
+man_MANS = $(myman_pages) gnupg.7
 
 watchgnupg_SOURCE = gnupg.texi