[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-204-g021767d

[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, master has been updated
       via  021767d8aa11aac8ac87dc3a31969ee6cfa65966 (commit)
      from  07227279c44e3af0939f90025a0d22b782d0f185 (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 021767d8aa11aac8ac87dc3a31969ee6cfa65966
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 6d06749..28e5c9a 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -507,7 +507,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 a0c0369..1af13d0 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -19,9 +19,10 @@
 
 EXTRA_DIST = ChangeLog-2011
 
-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
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common

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

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