security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

scd: move SCDaemon to libexecdir.

Browse Source 
* common/homedir.c (gnupg_module_name): It's now libexecdir.
* scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
(bin_PROGRAMS): Remove scdaemon.
This commit is contained in:
NIIBE Yutaka 2013-04-01 11:42:11 +09:00
parent 07227279c4
commit 021767d8aa
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/homedir.c
View File

@ -507,7 +507,7 @@ gnupg_module_name (int which)
#ifdef GNUPG_DEFAULT_SCDAEMON #ifdef GNUPG_DEFAULT_SCDAEMON
return GNUPG_DEFAULT_SCDAEMON; return GNUPG_DEFAULT_SCDAEMON;
#else #else
X(bindir, "scdaemon"); X(libexecdir, "scdaemon");
#endif #endif
case GNUPG_MODULE_NAME_DIRMNGR: case GNUPG_MODULE_NAME_DIRMNGR:

7
scd/Makefile.am
View File

@ -19,9 +19,10 @@
EXTRA_DIST = ChangeLog-2011 EXTRA_DIST = ChangeLog-2011
bin_PROGRAMS = scdaemon if HAVE_W32_SYSTEM
if ! HAVE_W32_SYSTEM libexec_PROGRAMS = scdaemon
libexec_PROGRAMS = gnupg-pcsc-wrapper else
libexec_PROGRAMS = scdaemon gnupg-pcsc-wrapper
endif endif
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common