From: Olaf Hering Subject: [PATCH 26/46] Use configure --docdir=DIR to set DOCDIR Date: Mon, 22 Sep 2014 15:00:15 +0200 Message-ID: <1411390835-7348-27-git-send-email-olaf@aepfle.de> References: <1411390835-7348-1-git-send-email-olaf@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1411390835-7348-1-git-send-email-olaf@aepfle.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Olaf Hering , Keir Fraser , David Scott , Stefano Stabellini , George Dunlap , Tim Deegan , Ian Jackson , Jan Beulich , Samuel Thibault , Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Olaf Hering --- Config.mk | 1 - config/Paths.mk.in | 1 + m4/paths.m4 | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index bb190f0..3353a71 100644 --- a/Config.mk +++ b/Config.mk @@ -58,7 +58,6 @@ endif include $(XEN_ROOT)/config/$(XEN_OS).mk include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk -DOCDIR ?= $(SHAREDIR)/doc/xen BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d # arguments: variable, common path part, path to test, if yes, if no diff --git a/config/Paths.mk.in b/config/Paths.mk.in index fe9ce8e..d369944 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -18,6 +18,7 @@ LIBEXEC := @LIBEXEC@ SHAREDIR := @SHAREDIR@ MANDIR := @MANDIR@ +DOCDIR := @DOCDIR@ LIBDIR := @LIBDIR@ XEN_RUN_DIR := @XEN_RUN_DIR@ diff --git a/m4/paths.m4 b/m4/paths.m4 index 5e90eb4..b36a336 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -72,6 +72,10 @@ dnl double eval because default mandir includes datarootdir, which includes pref MANDIR=`eval eval echo $mandir` AC_SUBST(MANDIR) +dnl double eval because default docdir includes datarootdir, which includes prefix +DOCDIR=`eval eval echo $docdir` +AC_SUBST(DOCDIR) + PRIVATE_PREFIX=$LIBDIR/xen AC_SUBST(PRIVATE_PREFIX)