Fix path of scdaemon.
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 7 Nov 2016 02:49:08 +0000 (11:49 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 7 Nov 2016 02:49:08 +0000 (11:49 +0900)
* am/cmacros.am (AM_CPPFLAGS): Add GNUPG_LIBEXECDIR.
* configure.ac (GNUPG_DEFAULT_SCD): Use GNUPG_LIBEXECDIR.

--
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
am/cmacros.am
configure.ac
src/scd/scd.c

index ca24616..7cfab3f 100644 (file)
@@ -1,4 +1,5 @@
-AM_CPPFLAGS += -DGNUPG_BINDIR="\"$(bindir)\""
+AM_CPPFLAGS += -DGNUPG_BINDIR="\"$(bindir)\"" \
+               -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
 datadir = @datadir@
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
index 5e87907..1886e2c 100644 (file)
@@ -69,7 +69,7 @@ AC_DEFINE_UNQUOTED(NEED_KSBA_VERSION, "$NEED_KSBA_VERSION",
 AH_BOTTOM([
 /* Setup the hardwired names of modules. */
 #ifndef GNUPG_DEFAULT_SCD
-#define GNUPG_DEFAULT_SCD    ( GNUPG_BINDIR "/scdaemon" )
+#define GNUPG_DEFAULT_SCD    ( GNUPG_LIBEXECDIR "/scdaemon" )
 #endif
 #ifndef GNUPG_DEFAULT_DIRMNGR
 #define GNUPG_DEFAULT_DIRMNGR    ( GNUPG_BINDIR "/dirmngr" )
index 9f60026..abd63f9 100644 (file)
@@ -180,8 +180,7 @@ scd_connect (scd_context_t *scd_ctx, const char *scd_path,
       no_close_list[i] = -1;
 
       /* connect to the scdaemon and perform initial handshaking */
-      rc = assuan_pipe_connect (&assuan_ctx, scd_path, argv,
-                                no_close_list);
+      rc = assuan_pipe_connect (&assuan_ctx, scd_path, argv, no_close_list);
       if (!rc)
        {
          log_msg_debug (loghandle,