diff options
| author | Werner Koch <wk@gnupg.org> | 2016-04-04 17:42:24 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-04-04 18:40:25 +0200 |
| commit | 96bcd4220f1f1313afe12097d8dc62342ac8de0d (patch) | |
| tree | bb31ae3382b7d3c0eb4e1d9979d1786a9d5a87ce /g10/keygen.c | |
| parent | tests: Add missing file. (diff) | |
| download | gnupg2-96bcd4220f1f1313afe12097d8dc62342ac8de0d.tar.xz gnupg2-96bcd4220f1f1313afe12097d8dc62342ac8de0d.zip | |
Now build "gpg" binary but install as "gpg2"
* configure.ac (USE_GPG2_HACK): New ac_define am_conditional.
* common/homedir.c (gnupg_module_name): Replace use of macro
NAME_OF_INSTALLED_GPG.
* g10/keygen.c (generate_keypair): Ditto.
* g10/Makefile.am (bin_PROGRAMS): Remove.
(noinst_PROGRAMS): Add gpg or gpg2 and gpgv or gpg2.
(gpg2_hack_list): New.
(use_gpg2_hack): New.
(gpg2_SOURCES): Rename to gpg_SOURCES.
(gpgv2_SOURCES): Rename to gpgv_SOURCES.
(gpg2_LDADD): Rename to gpg_LDADD.
(gpgv2_LDADD): Rename to gpgv_LDADD.
(gpg2_LDFLAGS): Rename to gpg_LDFLAGS.
(gpgv2_LDFLAGS): Rename to gpgv2_LDFLAGS.
(install-exec-hook): Remove WinCE specific rules and add new rules.
(uninstall-local): Uninstall gpg/gpg2 and gpgv/gpgv2.
* tests/openpgp/Makefile.am (required_pgms): s/gpg2/gpg/.
* tests/openpgp/defs.inc: Ditto.
* tests/openpgp/gpgtar.test: Ditto.
* tests/openpgp/mkdemodirs: Ditto.
* tests/openpgp/signdemokey: Ditto.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove obsolete
--enable-mailto, add --enable-gpg2-is-gpg.
--
Although we need to duplicate some automake generated code this method
allows to easily switch the name of the installed target using the
configure option "--enable-gpg2-is-gpg".
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/keygen.c')
| -rw-r--r-- | g10/keygen.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index a7d7d278b..06710eb4b 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -3779,7 +3779,12 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname, { tty_printf ( _("Note: Use \"%s %s\"" " for a full featured key generation dialog.\n"), - NAME_OF_INSTALLED_GPG, "--full-gen-key" ); +#if USE_GPG2_HACK + GPG_NAME "2" +#else + GPG_NAME +#endif + , "--full-gen-key" ); para = quickgen_set_para (para, 0, DEFAULT_STD_ALGO, DEFAULT_STD_KEYSIZE, DEFAULT_STD_CURVE); |