[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-97-g79d7e1d

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  79d7e1d86bbd658c14a2f9cf3b7b4b5562df17c3 (commit)
      from  c3495209ee6bdac6d6c631ded632fd540596f6e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 79d7e1d86bbd658c14a2f9cf3b7b4b5562df17c3
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Apr 1 11:42:11 2013 +0900

    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.

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

-----------------------------------------------------------------------

Summary of changes:
 common/homedir.c |    2 +-
 scd/Makefile.am  |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org