From 79d7e1d86bbd658c14a2f9cf3b7b4b5562df17c3 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 1 Apr 2013 11:42:11 +0900
Subject: [PATCH] scd: move SCDaemon to libexecdir.

* common/homedir.c (gnupg_module_name): It's now libexecdir.
* scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
(bin_PROGRAMS): Remove scdaemon.
---
 common/homedir.c | 2 +-
 scd/Makefile.am  | 7 ++++---
 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