diff options
| author | NIIBE Yutaka <[email protected]> | 2013-04-01 02:42:11 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2013-04-01 02:42:11 +0000 |
| commit | 79d7e1d86bbd658c14a2f9cf3b7b4b5562df17c3 (patch) | |
| tree | dbc1fe83f611e20e93471f5dd83b279652db7990 | |
| parent | scd: PC/SC status fix. (diff) | |
| download | gnupg-79d7e1d86bbd658c14a2f9cf3b7b4b5562df17c3.tar.gz gnupg-79d7e1d86bbd658c14a2f9cf3b7b4b5562df17c3.zip | |
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.
| -rw-r--r-- | common/homedir.c | 2 | ||||
| -rw-r--r-- | 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 |