build: introduce and export XEN_LIB_DIR

This variable defaults to /var/lib/xen. It will be used to substitute
various hard-coded paths in tools.

The new variable points to $localstatedir/lib/xen, which defaults to
/var/lib/xen, so there is no change in default configuration.

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 381c21a2e81b2c37cc6edc6ea107757c134a40f3..a4af50b40038ccd67a21bff7e9669272d52a67cc 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -181,7 +181,8 @@ 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_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR XEN_LOG_DIR \
+                   XEN_LIB_DIR
 
 buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1)))
 define buildmakevars2file-closure

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index 1c7afb4198fbe54147a99476909c21b0ab352117..f185f8717ddc688ed32f9aecbb86322720b58321 100644 (file)
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -40,6 +40,7 @@ MAN8DIR                  := $(mandir)/man8
 
 XEN_RUN_DIR              := @XEN_RUN_DIR@
 XEN_LOG_DIR              := @XEN_LOG_DIR@
+XEN_LIB_DIR              := @XEN_LIB_DIR@
 XEN_LIB_STORED           := @XEN_LIB_STORED@
 
 CONFIG_DIR               := @CONFIG_DIR@

diff --git a/configure b/configure
index ebc55ad741fd9972d4d2f4200957f118f7c4bb4c..6782100f8d5784c6dfee1be5da3835b0dbc64b0b 100755 (executable)
--- a/configure
+++ b/configure
@@ -603,6 +603,7 @@ XEN_CONFIG_DIR
 INITD_DIR
 CONFIG_DIR
 SHAREDIR
+XEN_LIB_DIR
 XEN_LIB_STORED
 XEN_LOG_DIR
 XEN_RUN_DIR
@@ -1980,6 +1981,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 
 
+XEN_LIB_DIR=$localstatedir/lib/xen
+
+
 SHAREDIR=$prefix/share
 
 

diff --git a/m4/paths.m4 b/m4/paths.m4
index fa902bb35fcff1ba5287d1f1d0881c8f6d57e81b..1c444c4d364a3f217ef125de801366512b35a44f 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_LIB_DIR=$localstatedir/lib/xen
+AC_SUBST(XEN_LIB_DIR)
+
 SHAREDIR=$prefix/share
 AC_SUBST(SHAREDIR)
 

diff --git a/tools/configure b/tools/configure
index 42e07a65b64763373deeb3c34d5147ca64fd5e03..7d16f67bd17ab4d5d619572ef41933daec9aa586 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -722,6 +722,7 @@ XEN_CONFIG_DIR
 INITD_DIR
 CONFIG_DIR
 SHAREDIR
+XEN_LIB_DIR
 XEN_LIB_STORED
 XEN_LOG_DIR
 XEN_RUN_DIR
@@ -3939,6 +3940,9 @@ XEN_LOG_DIR=$localstatedir/log/xen
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 
 
+XEN_LIB_DIR=$localstatedir/lib/xen
+
+
 SHAREDIR=$prefix/share