aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/homedir.c2
-rw-r--r--scd/Makefile.am7
2 files changed, 5 insertions, 4 deletions
diff --git a/common/homedir.c b/common/homedir.c
index 5f2e31e0a..d0fc5c631 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -410,7 +410,7 @@ gnupg_module_name (int which)
#ifdef GNUPG_DEFAULT_SCDAEMON
return GNUPG_DEFAULT_SCDAEMON;
#else
- X(bindir, "scdaemon");
+ X(libexecdir, "scdaemon");
#endif
case GNUPG_MODULE_NAME_DIRMNGR:
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 58e2f9b1b..db339a21f 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -17,9 +17,10 @@
## Process this file with automake to produce Makefile.in
-bin_PROGRAMS = scdaemon
-if ! HAVE_W32_SYSTEM
-libexec_PROGRAMS = gnupg-pcsc-wrapper
+if HAVE_W32_SYSTEM
+libexec_PROGRAMS = scdaemon
+else
+libexec_PROGRAMS = scdaemon gnupg-pcsc-wrapper
endif
EXTRA_DIST = ChangeLog-2011