[PATCH 10/17] build: introduce XEN_RUN_STORED

[Wei Liu <wei.liu2@citrix.com>]

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>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>

Need to run autogen.sh.
---
 Config.mk          | 2 +-
 config/Paths.mk.in | 1 +
 configure          | 4 ++++
 docs/configure     | 4 ++++
 m4/paths.m4        | 3 +++
 tools/Makefile     | 2 ++
 tools/configure    | 4 ++++
 7 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index a4af50b..723e129 100644
--- 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 f185f87..62cea48 100644
--- 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 6782100..8c58494 100755
--- 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 46f0e68..6481bae 100755
--- 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 1c444c4..722a8aa 100644
--- 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 cc45758..71515b4 100644
--- 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 86f1a81..4c92fa2 100755
--- 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
 
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel