From: Eric Blake <eblake@redhat.com>
Date: Fri, 4 Jan 2013 20:48:30 +0000 (-0700)
Subject: build: properly substitute virtlockd.socket
X-Git-Tag: v1.0.2-rc1~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb854b8f6128002306c1bc07113cf038a50be8bc;p=thirdparty%2Flibvirt.git

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 5e13bd4c2d..6dfb00263f 100644
--- 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 0589a29018..a6eef4fa87 100644
--- 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