build: honour $(runstatedir) in make rules

Creating various directories using $(runstatedir) instead of
$(localstatedir)/run.

There's no functional change by default yet since both expressions
expand to the same value.

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

diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 560b214877a19527c1293949236c6bcc208024b6..a2151162e6e33cdc27aa32d8cdef2929b440147d 100644 (file)
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -129,12 +129,12 @@ INSTALL_DATA_DIRS += libxl
 
 install-data-libxl:
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
+       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/libxl"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
 
 uninstall-data-libxl:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||:
+       rmdir "$(DESTDIR)$(runstatedir)/libvirt/libxl" ||:
        rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
 
 endif WITH_LIBXL

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 68cd10013ef12dcb24cecbe5d3721dd2db1a4c42..fae92a6e45c77d1e7906c424f1457768621d6a74 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -203,7 +203,7 @@ INSTALL_DATA_DIRS += locking
 install-data-locking:
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lockd"
+       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/lockd"
 if WITH_SANLOCK
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock"
 endif WITH_SANLOCK
@@ -211,7 +211,7 @@ endif WITH_SANLOCK
 uninstall-data-locking:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lockd" ||:
+       rmdir "$(DESTDIR)$(runstatedir)/libvirt/lockd" ||:
 if WITH_SANLOCK
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/sanlock" ||:
 endif WITH_SANLOCK

diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 22c582c38020881554c60a18545abf039f53c61c..b4d560702cd2281e63cb617bc87bf8a5e6df1cda 100644 (file)
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -229,12 +229,12 @@ INSTALL_DATA_DIRS += lxc
 
 install-data-lxc:
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc"
+       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/lxc"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc"
 
 uninstall-data-lxc:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lxc" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||:
+       rmdir "$(DESTDIR)$(runstatedir)/libvirt/lxc" ||:
        rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||:
 
 endif WITH_LXC

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 091b722172dbc128b55e2ece965f57a67c42c015..9f20dad7b3aa92ab15bb53545f479ea962afb4db 100644 (file)
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -136,7 +136,7 @@ UUID=$(shell uuidgen 2>/dev/null)
 install-data-network:
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/network"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/dnsmasq"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/network"
+       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/network"
        $(MKDIR_P) "$(DESTDIR)$(confdir)/qemu/networks/autostart"
        $(INSTALL_DATA) $(srcdir)/network/default.xml \
          $(DESTDIR)$(confdir)/qemu/networks/default.xml
@@ -163,7 +163,7 @@ uninstall-data-network:
        rmdir "$(DESTDIR)$(confdir)/qemu/networks/autostart" || :
        rmdir "$(DESTDIR)$(confdir)/qemu/networks" || :
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/network" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/network" ||:
+       rmdir "$(DESTDIR)$(runstatedir)/libvirt/network" ||:
 if WITH_FIREWALLD_ZONE
        rm -f  $(DESTDIR)$(prefix)/lib/firewalld/zones/libvirt.xml
 endif WITH_FIREWALLD_ZONE

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 30a9751cfd6d3c7c859166168a988390f5791fa7..d16b315ebc33cfbe293aad507d6d338ea375cd1d 100644 (file)
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -187,20 +187,20 @@ INSTALL_DATA_DIRS += qemu
 
 install-data-qemu:
        $(MKDIR_P) -m 0751 "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu"
+       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/qemu"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/qemu"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/swtpm"
-       $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/qemu/swtpm"
+       $(MKDIR_P) "$(DESTDIR)$(runstatedir)/libvirt/qemu/swtpm"
        $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/swtpm/libvirt/qemu"
 
 uninstall-data-qemu:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/qemu" ||:
-       rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/qemu" ||:
+       rmdir "$(DESTDIR)$(runstatedir)/libvirt/qemu" ||:
        rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt/qemu" ||:
        rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/qemu" ||:
        rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/swtpm"
-       rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/qemu/swtpm" ||:
+       rmdir "$(DESTDIR)$(runstatedir)/libvirt/qemu/swtpm" ||:
        rmdir "$(DESTDIR)$(localstatedir)/log/swtpm/libvirt/qemu" ||:
 
 endif WITH_QEMU