diff options
| author | Werner Koch <[email protected]> | 2024-09-11 08:46:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-09-11 12:30:40 +0000 |
| commit | 2125f228d36c0882a87bce433a18253154653d50 (patch) | |
| tree | ca2105d3c6577234f47f452409cf790dca2ba8de /doc/mkdefsinc.c | |
| parent | build: Also cleanup generated html file in a make distcheck (diff) | |
| download | gnupg-2125f228d36c0882a87bce433a18253154653d50.tar.gz gnupg-2125f228d36c0882a87bce433a18253154653d50.zip | |
build: Remove configure option --enable-gpg-is-gpg2
* 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.
Diffstat (limited to '')
| -rw-r--r-- | doc/mkdefsinc.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/doc/mkdefsinc.c b/doc/mkdefsinc.c index b8fbed6e9..55a71a7d5 100644 --- a/doc/mkdefsinc.c +++ b/doc/mkdefsinc.c @@ -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. */ |