systemd: Fix location of p11-kit-remote

The p11-kit-remote executable is now located under $libexecdir, but we
should use the p11-kit command to launch the subcommand.

diff --git a/Makefile.am b/Makefile.am
index ff97372e4debe91ec645313ab82dc87612439df0..2df3cc7c97082af9994d8cecc1004ca25074b4cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,8 @@ private_PROGRAMS =
 
 CHECK_PROGS =
 
+CLEANFILES =
+
 EXTRA_DIST = HACKING
 
 incdir = $(includedir)/p11-kit-1/p11-kit

diff --git a/configure.ac b/configure.ac
index 12feff8c2b69fb68c8ef1abfc5418959767aba22..52c9067b54e7aff7c2d05b473ef1ab00c386a0d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -503,7 +503,6 @@ AC_CONFIG_FILES([Makefile
        po/Makefile.in
        p11-kit/p11-kit-1.pc
        p11-kit/pkcs11.conf.example
-       p11-kit/p11-kit-remote@.service
        trust/trust-extract-compat
        trust/test-extract
 ])

diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index e30c431d02a1863a5e5f90ba4fb665f59ce72cd8..4e97f90bfeafd8a8f9e4211d8658fe10b27a3be5 100644 (file)
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -154,9 +154,17 @@ pkgconfig_DATA = p11-kit/p11-kit-1.pc
 exampledir = $(p11_system_config)
 example_DATA = p11-kit/pkcs11.conf.example
 
+p11-kit/p11-kit-remote@.service: p11-kit/p11-kit-remote@.service.in
+       $(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' \
+                       -e 's|@libdir[@]|$(libdir)|g' $< > $@.tmp && \
+               mv $@.tmp $@
+
+CLEANFILES += p11-kit/p11-kit-remote@.service
+
 EXTRA_DIST += \
        p11-kit/docs.h \
        p11-kit/p11-kit-remote.socket \
+       p11-kit/p11-kit-remote@.service.in \
        $(NULL)
 
 bin_PROGRAMS += p11-kit/p11-kit

diff --git a/p11-kit/p11-kit-remote@.service.in b/p11-kit/p11-kit-remote@.service.in
index dd6d33267b4045b470fdb03456db3ac27b3a98fa..f29196d066a113ec8e38876522a7b0e922b27664 100644 (file)
--- a/p11-kit/p11-kit-remote@.service.in
+++ b/p11-kit/p11-kit-remote@.service.in
@@ -7,4 +7,4 @@ Requires=p11-kit-remote.socket
 StandardInput=socket
 StandardOutput=socket
 StandardError=journal
-ExecStart=@libdir@/p11-kit/p11-kit-remote @libdir@/p11-kit-proxy.so
+ExecStart=@bindir@/p11-kit remote @libdir@/p11-kit-proxy.so