diff options
| author | Daiki Ueno <dueno@redhat.com> | 2017-02-24 09:57:34 +0100 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2017-02-27 17:12:05 +0100 |
| commit | 7053ace4ae5b3e2129e5a8ffe482420bfc14f894 (patch) | |
| tree | 476cf038821a4aec98c6d49b42b98bdb0ac75b4d | |
| parent | 156b0c9249f6da54195d2a6a817ea92552e78bf8 (diff) | |
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.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | p11-kit/Makefile.am | 8 | ||||
| -rw-r--r-- | p11-kit/p11-kit-remote@.service.in | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index ff97372..2df3cc7 100644 --- 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 12feff8..52c9067 100644 --- 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 e30c431..4e97f90 100644 --- 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 dd6d332..f29196d 100644 --- 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 |