diff options
| author | Werner Koch <[email protected]> | 2016-04-04 15:42:24 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-04-04 16:40:25 +0000 |
| commit | 96bcd4220f1f1313afe12097d8dc62342ac8de0d (patch) | |
| tree | bb31ae3382b7d3c0eb4e1d9979d1786a9d5a87ce /tests/openpgp/mkdemodirs | |
| parent | tests: Add missing file. (diff) | |
| download | gnupg-96bcd4220f1f1313afe12097d8dc62342ac8de0d.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'tests/openpgp/mkdemodirs')
| -rwxr-xr-x | tests/openpgp/mkdemodirs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/openpgp/mkdemodirs b/tests/openpgp/mkdemodirs index a381681b0..fd8a7410e 100755 --- a/tests/openpgp/mkdemodirs +++ b/tests/openpgp/mkdemodirs @@ -4,7 +4,7 @@ set -e # We need to use --no-options so that a gpg.conf from an older version # of gpg is not used. -GPG="../../g10/gpg2 --no-options --batch --quiet +GPG="../../g10/gpg --no-options --batch --quiet --no-secmem-warning --allow-secret-key-import" NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India |