summaryrefslogtreecommitdiffstats
path: root/common/homedir.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/homedir.c')
-rw-r--r--common/homedir.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/common/homedir.c b/common/homedir.c
index 392910867..a73182e30 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -1864,20 +1864,10 @@ gnupg_module_name (int which)
X(bindir, "sm", "gpgsm");
case GNUPG_MODULE_NAME_GPG:
-#if USE_GPG2_HACK
- if (! gnupg_build_directory)
- X(bindir, "g10", GPG_NAME "2");
- else
-#endif
- X(bindir, "g10", GPG_NAME);
+ X(bindir, "g10", GPG_NAME);
case GNUPG_MODULE_NAME_GPGV:
-#if USE_GPG2_HACK
- if (! gnupg_build_directory)
- X(bindir, "g10", GPG_NAME "v2");
- else
-#endif
- X(bindir, "g10", GPG_NAME "v");
+ X(bindir, "g10", GPG_NAME "v");
case GNUPG_MODULE_NAME_CONNECT_AGENT:
X(bindir, "tools", "gpg-connect-agent");