xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>, Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH 04/17] build: introduce and export XEN_LIB_DIR
Date: Mon, 13 Jun 2016 08:49:02 +0100	[thread overview]
Message-ID: <1465804155-14469-5-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com>

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

Need to rerun autogen.sh
---
 Config.mk          | 3 ++-
 config/Paths.mk.in | 1 +
 configure          | 4 ++++
 m4/paths.m4        | 3 +++
 tools/configure    | 4 ++++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 381c21a..a4af50b 100644
--- 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 1c7afb4..f185f87 100644
--- 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 ebc55ad..6782100 100755
--- 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 fa902bb..1c444c4 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_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 42e07a6..7d16f67 100755
--- 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
 
 
-- 
2.1.4


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

  parent reply	other threads:[~2016-06-13  7:49 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-13  7:48 [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
2016-06-13  7:48 ` [PATCH 01/17] oxenstored: honour XEN_{LOG, RUN}_DIR in oxenstored.conf Wei Liu
2016-06-13  7:49 ` [PATCH 02/17] oxenstored: generate a paths module Wei Liu
2016-06-13  7:49 ` [PATCH 03/17] oxenstored: honour XEN_LOG_DIR defined by configure Wei Liu
2016-06-13 10:07   ` Andrew Cooper
2016-06-13 10:34     ` Wei Liu
2016-06-13  7:49 ` Wei Liu [this message]
2016-06-13 15:10   ` [PATCH 04/17] build: introduce and export XEN_LIB_DIR Ian Jackson
2016-06-13  7:49 ` [PATCH 05/17] tools: install and remove XEN_LIB_DIR in Makefile Wei Liu
2016-06-13 15:11   ` Ian Jackson
2016-06-13  7:49 ` [PATCH 06/17] hotplug/Linux: honour XEN_LIB_DIR Wei Liu
2016-06-13 15:12   ` Ian Jackson
2016-06-13  7:49 ` [PATCH 07/17] libxl: " Wei Liu
2016-06-13 15:12   ` Ian Jackson
2016-06-13  7:49 ` [PATCH 08/17] tools: remove hard-coded /var/lib/xen in Makefile Wei Liu
2016-06-13 15:13   ` Ian Jackson
2016-06-13 15:29     ` Wei Liu
2016-06-13 16:07       ` Ian Jackson
2016-06-13 16:33         ` Wei Liu
2016-06-13 16:57           ` Ian Jackson
2016-06-13 18:16             ` Wei Liu
2016-06-14  9:56               ` Ian Jackson
2016-06-13  7:49 ` [PATCH 09/17] docs: honour XEN_DUMP_DIR Wei Liu
2016-06-13 15:15   ` Ian Jackson
2016-06-13  7:49 ` [PATCH 10/17] build: introduce XEN_RUN_STORED Wei Liu
2016-06-14 17:00   ` Ian Jackson
2016-06-13  7:49 ` [PATCH 11/17] hotplug/Linux: honour XEN_RUN_STORED Wei Liu
2016-06-13 15:19   ` Ian Jackson
2016-06-13  7:49 ` [PATCH 12/17] libxenstore: " Wei Liu
2016-06-13 15:19   ` Ian Jackson
2016-06-13  7:49 ` [PATCH 13/17] hotplug/FreeBSD: " Wei Liu
2016-06-13  9:32   ` Roger Pau Monné
2016-06-13 15:20   ` Ian Jackson
2016-06-13  7:49 ` [PATCH 14/17] ocaml/libxs: generate a paths.ml Wei Liu
2016-06-13 15:19   ` Ian Jackson
2016-06-13 15:22     ` Wei Liu
2016-06-13 19:50       ` David Scott
2016-06-14  9:36         ` Wei Liu
2016-06-14 20:08           ` David Scott
2016-06-15  9:07             ` Wei Liu
2016-06-13  7:49 ` [PATCH 15/17] ocaml/libxs: honour XEN_RUN_STORED Wei Liu
2016-06-14 20:06   ` David Scott
2016-06-13  7:49 ` [PATCH 16/17] oxenstored: honour XEN_RUN_STORED and XEN_CONFIG_DIR Wei Liu
2016-06-14 20:07   ` David Scott
2016-06-13  7:49 ` [PATCH 17/17] oxenstored: honour XEN_RUN_STORED in systemd C stub Wei Liu
2016-06-14 20:07   ` David Scott
2016-06-14 13:17 ` [PATCH 00/17] Honour more configure variables in various places (iteration 2) Wei Liu
2016-06-17 10:43   ` Wei Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465804155-14469-5-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).