[Xen-devel] [PATCH 26/46] Use configure --docdir=DIR to set DOCDIR

[Olaf Hering <olaf@xxxxxxxxx>]

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 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)
 

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