build: use $(COMMON_UNIT_VARS) for logging/locking systemd units

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 37d0e79f40a414ca00a2524aff691b5f9854d032..68cd10013ef12dcb24cecbe5d3721dd2db1a4c42 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -259,24 +259,14 @@ locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \
 
 
 virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed \
-           -e 's|[@]sbindir[@]|$(sbindir)|g' \
-           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-           < $< > $@-t && \
-           mv $@-t $@
+       $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed \
-           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-           < $< > $@-t && \
-           mv $@-t $@
+       $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 virtlockd-admin.socket: locking/virtlockd-admin.socket.in \
                         $(top_builddir)/config.status
-       $(AM_V_GEN)sed \
-           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-           < $< > $@-t && \
-           mv $@-t $@
+       $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 virtlockd.8.in: locking/virtlockd.pod
        $(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \

diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index b952021d0087946b11ff0d9af80d493b3b6a1366..7e441dbffb61327cb1fe23a2b13400f65689f6ba 100644 (file)
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -123,21 +123,11 @@ virtlogd.8.in: logging/virtlogd.pod
        mv $@-t2 $@
 
 virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed \
-           -e 's|[@]sbindir[@]|$(sbindir)|g' \
-           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-           < $< > $@-t && \
-           mv $@-t $@
+       $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 virtlogd.socket: logging/virtlogd.socket.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed \
-           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-           < $< > $@-t && \
-           mv $@-t $@
+       $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@
 
 virtlogd-admin.socket: logging/virtlogd-admin.socket.in \
                        $(top_builddir)/config.status
-       $(AM_V_GEN)sed \
-           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-           < $< > $@-t && \
-           mv $@-t $@
+       $(AM_V_GEN)sed $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@