scd: move SCDaemon to libexecdir

[NIIBE Yutaka]

Hello,

I think that SCDaemon should not be in bindir, since it is not expected
to be run as command line directly by any user (including developers who
test it).  When it's in bindir, it's just troublesome when user invokes
it by the command line.

Here is a change to move scdaemon to libexecdir (for STABLE-BRANCH-2-0).
Built and tested.

I think that this should be included for forthcoming 2.0.20.

diff --git a/common/homedir.c b/common/homedir.c
index 5f2e31e..d0fc5c6 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 58e2f9b..db339a2 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
--