build: introduce XEN_RUN_STORED

It defaults to /var/run/xenstored. It will be used later to remove some
hard-coded paths in tree. There should be no visible change to default
configuration.

Install and remove it in respective Makefile targets.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Config.mk b/Config.mk
index a4af50b40038ccd67a21bff7e9669272d52a67cc..723e12948dffa8f0d943d64784f71c4d1e43376b 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -182,7 +182,7 @@ endef
 BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \
                    XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \
                    XEN_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR XEN_LOG_DIR \
-                   XEN_LIB_DIR
+                   XEN_LIB_DIR XEN_RUN_STORED
 
 buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1)))
 define buildmakevars2file-closure

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index f185f8717ddc688ed32f9aecbb86322720b58321..62cea48a582911c0f059b36e5d6c2a9ed4226313 100644 (file)
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -42,6 +42,7 @@ XEN_RUN_DIR              := @XEN_RUN_DIR@
 XEN_LOG_DIR              := @XEN_LOG_DIR@
 XEN_LIB_DIR              := @XEN_LIB_DIR@
 XEN_LIB_STORED           := @XEN_LIB_STORED@
+XEN_RUN_STORED           := @XEN_RUN_STORED@
 
 CONFIG_DIR               := @CONFIG_DIR@
 INITD_DIR                := @INITD_DIR@

diff --git a/configure b/configure
index 6782100f8d5784c6dfee1be5da3835b0dbc64b0b..8c58494203d37949679d3d123a6672694eec7cfd 100755 (executable)
--- a/configure
+++ b/configure
@@ -604,6 +604,7 @@ INITD_DIR
 CONFIG_DIR
 SHAREDIR
 XEN_LIB_DIR
+XEN_RUN_STORED
 XEN_LIB_STORED
 XEN_LOG_DIR
 XEN_RUN_DIR
@@ -1981,6 +1982,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 
 
+XEN_RUN_STORED=$localstatedir/run/xenstored
+
+
 XEN_LIB_DIR=$localstatedir/lib/xen
 
 

diff --git a/docs/configure b/docs/configure
index 46f0e68ea51d4fa48f6342a1bb55ce43d6afcdc9..6481baed7116c762f3d563993505560e9146d5ec 100755 (executable)
--- a/docs/configure
+++ b/docs/configure
@@ -603,6 +603,7 @@ INITD_DIR
 CONFIG_DIR
 SHAREDIR
 XEN_LIB_DIR
+XEN_RUN_STORED
 XEN_LIB_STORED
 XEN_LOG_DIR
 XEN_RUN_DIR
@@ -1887,6 +1888,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 
 
+XEN_RUN_STORED=$localstatedir/run/xenstored
+
+
 XEN_LIB_DIR=$localstatedir/lib/xen
 
 

diff --git a/m4/paths.m4 b/m4/paths.m4
index 1c444c4d364a3f217ef125de801366512b35a44f..722a8aa4a9be5d38f7f64d1e802ec469dc3d61d8 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -107,6 +107,9 @@ AC_SUBST(XEN_LOG_DIR)
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 AC_SUBST(XEN_LIB_STORED)
 
+XEN_RUN_STORED=$localstatedir/run/xenstored
+AC_SUBST(XEN_RUN_STORED)
+
 XEN_LIB_DIR=$localstatedir/lib/xen
 AC_SUBST(XEN_LIB_DIR)
 

diff --git a/tools/Makefile b/tools/Makefile
index cc457587b32dcb81808de1741163e7295799dc5e..71515b48e07230da13a702ebbcb6d22102406415 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -64,6 +64,7 @@ install: subdirs-install
        $(INSTALL_DIR) $(DESTDIR)$(XEN_LOG_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_STORED)
 
 .PHONY: uninstall
 uninstall: D=$(DESTDIR)
@@ -78,6 +79,7 @@ uninstall:
        rm -f  $(D)$(SYSCONFIG_DIR)/xencommons
        rm -rf $(D)$(XEN_LIB_DIR)
        rm -rf $(D)$(XEN_LIB_STORED)
+       rm -rf $(D)$(XEN_RUN_STORED)
        rm -rf $(D)$(bindir)/cpuperf-perfcntr $(D)$(bindir)/cpuperf-xen
        rm -rf $(D)$(bindir)/xc_shadow
        rm -rf $(D)$(bindir)/pygrub

diff --git a/tools/configure b/tools/configure
index 86f1a8120a34ac61fbc594fab9f44a0fb2868299..4c92fa266f5f4c1405bc62401c5bc42f66da13bd 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -723,6 +723,7 @@ INITD_DIR
 CONFIG_DIR
 SHAREDIR
 XEN_LIB_DIR
+XEN_RUN_STORED
 XEN_LIB_STORED
 XEN_LOG_DIR
 XEN_RUN_DIR
@@ -3940,6 +3941,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 
 
+XEN_RUN_STORED=$localstatedir/run/xenstored
+
+
 XEN_LIB_DIR=$localstatedir/lib/xen