security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

build: Remove configure option --enable-gpg-is-gpg2

Browse source 
* configure.ac (--enable-gpg-is-gpg2): Remove option.
(USE_GPG2_HACK): Remove var.
* common/homedir.c (gnupg_module_name): Remove code for gpg2
installation option.
* g10/keygen.c (generate_keypair): Ditto.
* g10/Makefile.am (noinst_PROGRAMS): Ditto.
* doc/gpg.texi: Ditto.
* doc/gpgv.texi: Ditto.
--

This option and all its build stuff does not make anymore sense.  gpg1
is way too old for anyone to use on a regualar base along with a
standard gpg.  It is better to rename that single gpg (1.4) binary to
gpg1 and adjust any scripts.
This commit is contained in:
Werner Koch 2024-09-11 10:46:00 +02:00
parent 51bccae168
commit 2125f228d3
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
7 changed files with 9 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

13
doc/mkdefsinc.c
View file

@ -49,11 +49,6 @@
#endif /*HAVE_W32_SYSTEM*/
#if USE_GPG2_HACK
# define gpg2_suffix "2"
#else
# define gpg2_suffix ""
#endif
static int verbose;
@ -303,10 +298,6 @@ main (int argc, char **argv)
fputs ("\n@c Flags\n\n", stdout);
#if USE_GPG2_HACK
fputs ("@set gpgtwohack 1\n\n", stdout);
#endif
fputs ("\n@c Directories\n\n", stdout);
print_filename ("@set BINDIR ", GNUPG_BINDIR );
@ -345,8 +336,8 @@ main (int argc, char **argv)
fputs ("\n@c Macros\n\n", stdout);
printf ("@macro gpgname\n%s%s\n@end macro\n", GPG_NAME, gpg2_suffix);
printf ("@macro gpgvname\n%sv%s\n@end macro\n", GPG_NAME, gpg2_suffix);
printf ("@macro gpgname\n%s\n@end macro\n", GPG_NAME);
printf ("@macro gpgvname\n%sv\n@end macro\n", GPG_NAME);
/* Trailer. */