From patchwork Mon Jun 13 07:49:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9172241 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 508F0604DB for ; Mon, 13 Jun 2016 07:51:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42F8C20499 for ; Mon, 13 Jun 2016 07:51:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37FDF2665D; Mon, 13 Jun 2016 07:51:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6C6BC22230 for ; Mon, 13 Jun 2016 07:51:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCMcd-0005vx-6i; Mon, 13 Jun 2016 07:49:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCMcb-0005tc-3y for xen-devel@lists.xenproject.org; Mon, 13 Jun 2016 07:49:21 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id BE/1E-07320-0856E575; Mon, 13 Jun 2016 07:49:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42JxWrohUrchNS7 c4MpULovvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPjqmXMBT9EKjYdWMHUwNgm2MXIySEh4C9x ZMlNZhCbTUBZ4mdnLxuILSKgJ9F04DkjiM0s4CXxYt0/IJuDQ1jATmL993iQMIuAqsSD3SvZQ WxeAWeJh9dfs0CMlJM4f/wnM0g5p4CLxJN35iBhIaCShlmHmSFsBYmO6ceYIFoFJU7OfMICsU lC4uCLF2CtEgLcEn+77Scw8s1CUjULSdUCRqZVjBrFqUVlqUW6hmZ6SUWZ6RkluYmZObqGBqZ 6uanFxYnpqTmJScV6yfm5mxiB4cQABDsYz5/2PMQoycGkJMor4RMXLsSXlJ9SmZFYnBFfVJqT WnyIUYaDQ0mCd38KUE6wKDU9tSItMwcY2DBpCQ4eJRHe4yBp3uKCxNzizHSI1ClGRSlx3jiQh ABIIqM0D64NFk2XGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMy7F2QKT2ZeCdz0V0CLmYAWc+ yLBllckoiQkmpg5Opv4tRTyF/5Z0W7p/ztrwd/BOf8uuicuP7VcaWJzutXKvdGr6r/PeV7c3v ahLaHbuk3n4entHXdEL+ybcuNVyyRGzbfYin6+anuU8qdaRznPH7JnZH4UHfZuPXpD1W2ggsv vPZ8fGuTlDjfzdk57MyUVs6Zlg/+R967NHX9vwTBw/7tBhPy9yuxFGckGmoxFxUnAgDhcu7ro QIAAA== X-Env-Sender: prvs=9655a08af=wei.liu2@citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1465804157!44533302!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21928 invoked from network); 13 Jun 2016 07:49:19 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Jun 2016 07:49:19 -0000 X-IronPort-AV: E=Sophos;i="5.26,466,1459814400"; d="scan'208";a="359992701" From: Wei Liu To: Xen-devel Date: Mon, 13 Jun 2016 08:49:02 +0100 Message-ID: <1465804155-14469-5-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com> References: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Wei Liu Subject: [Xen-devel] [PATCH 04/17] build: introduce and export XEN_LIB_DIR X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Ian Jackson --- Cc: Ian Jackson 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