scd: move SCDaemon to libexecdir.
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 1 Apr 2013 02:42:11 +0000 (11:42 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 1 Apr 2013 02:42:11 +0000 (11:42 +0900)
* common/homedir.c (gnupg_module_name): It's now libexecdir.
* scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
(bin_PROGRAMS): Remove scdaemon.

common/homedir.c
scd/Makefile.am

index 5f2e31e..d0fc5c6 100644 (file)
@@ -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:
index 58e2f9b..db339a2 100644 (file)
 
 ## 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