build: properly substitute virtlockd.socket

virtlockd.service could be installed to a configurable root,
but virtlockd.socket was hardcoded to installation into a
distro.

* src/Makefile.am (virtlockd.service, virtlockd.socket): Drop
unused substitutions.
* src/locking/virtlockd.socket.in (ListenStream): Don't hard-code
/var.

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e13bd4c2d3068dfa05aa08229926edd965e62ac..6dfb00263f6f1925d210a243224ad2106b1c9f6a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1707,9 +1707,7 @@ endif
 
 virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status
        $(AM_V_GEN)sed                                          \
-           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
            -e 's|[@]sbindir[@]|$(sbindir)|g'                   \
-           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'             \
            < $< > $@-t &&                                      \
            chmod a+x $@-t &&                                   \
            mv $@-t $@
@@ -1717,8 +1715,6 @@ virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status
 virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status
        $(AM_V_GEN)sed                                          \
            -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
-           -e 's|[@]sbindir[@]|$(sbindir)|g'                   \
-           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'             \
            < $< > $@-t &&                                      \
            chmod a+x $@-t &&                                   \
            mv $@-t $@

diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
index 0589a2901832bc4b76ac7cce251866848640fc89..a6eef4fa871be9e211b30fa3a2d12f3743eb34bc 100644 (file)
--- a/src/locking/virtlockd.socket.in
+++ b/src/locking/virtlockd.socket.in
@@ -2,7 +2,7 @@
 Description=Virtual machine lock manager socket
 
 [Socket]
-ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock
+ListenStream=@localstatedir@/run/libvirt/virtlockd/virtlockd.sock
 
 [Install]
 WantedBy=multi-user.target