commit cb854b8f6128002306c1bc07113cf038a50be8bc Author: Eric Blake Date: Fri Jan 4 13:48:30 2013 -0700 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. Index: libvirt-1.0.1/src/Makefile.am =================================================================== --- libvirt-1.0.1.orig/src/Makefile.am +++ libvirt-1.0.1/src/Makefile.am @@ -1704,9 +1704,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 $@ @@ -1714,8 +1712,6 @@ virtlockd.service: locking/virtlockd.ser 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 $@ Index: libvirt-1.0.1/src/locking/virtlockd.socket.in =================================================================== --- libvirt-1.0.1.orig/src/locking/virtlockd.socket.in +++ libvirt-1.0.1/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