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.

2 files changed, 3 insertions, 62 deletions

diff --git a/g10/Makefile.am b/g10/Makefile.am
index e8d8e9017..4e1306da3 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -35,22 +35,10 @@ AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
 
 needed_libs = ../kbx/libkeybox.a $(libcommonpth) ../regexp/libregexp.a
 
-# Because there are no program specific transform macros we need to
-# work around that to allow installing gpg as gpg2.
-gpg2_hack_list = gpg gpgv
-if USE_GPG2_HACK
-gpg2_hack_uninst = gpg2 gpgv2
-use_gpg2_hack = yes
-else
-gpg2_hack_uninst = $(gpg2_hack_list)
-use_gpg2_hack = no
-endif
 
-# NB: We use noinst_ for gpg and gpgv so that we can install them with
-# the install-hook target under the name gpg2/gpgv2.
-noinst_PROGRAMS = gpg
-noinst_PROGRAMS += gpgv
-noinst_PROGRAMS += $(module_tests)
+bin_PROGRAMS = gpg gpgv
+
+noinst_PROGRAMS = $(module_tests)
 if DISABLE_TESTS
 TESTS =
 else
@@ -208,54 +196,11 @@ t_keyid_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
 
 $(PROGRAMS): $(needed_libs) ../common/libgpgrl.a
 
-# NB: To install gpg and gpgv we use this -hook.  This code has to
-# duplicate most of the automake generated install-binPROGRAMS target
-# so that directories are created and the transform feature works.
-install-exec-hook:
-	@echo "running install-exec-hook"; \
-        echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-        $(MKDIR_P) "$(DESTDIR)$(bindir)"; \
-	for p in $(gpg2_hack_list); do \
-          echo "$$p$(EXEEXT) $$p$(EXEEXT)"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    for f in $$files; do \
-	       if test $(use_gpg2_hack) = yes ; \
-		 then f2=`echo "$${f}" | sed 's/$(EXEEXT)$$//'`2$(EXEEXT); \
-	         else f2="$${f}" ;\
-	       fi ; \
-	       echo "$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) \
-                     $${f} '$(DESTDIR)$(bindir)/$${f2}'"; \
-	       $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) \
-                     $${f} "$(DESTDIR)$(bindir)/$${f2}"; \
-	    done; \
-	done
-
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL_DATA) $(srcdir)/distsigkey.gpg \
 				$(DESTDIR)$(pkgdatadir)/distsigkey.gpg
 
-# NB: For uninstalling gpg and gpgv we use -local because there is
-# no need for a specific order the targets need to be run.
 uninstall-local:
 	-@rm $(DESTDIR)$(pkgdatadir)/distsigkey.gpg
-	-@files=`for p in $(gpg2_hack_uninst); do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
diff --git a/g10/keygen.c b/g10/keygen.c
index 98608ad96..b39836cd0 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -5859,11 +5859,7 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
 
       tty_printf ( _("Note: Use \"%s %s\""
                      " for a full featured key generation dialog.\n"),
-#if USE_GPG2_HACK
-                   GPG_NAME "2"
-#else
                    GPG_NAME
-#endif
                    , "--full-generate-key" );
 
       err = parse_key_parameter_string (ctrl, NULL, -1, 0,