[Xen-devel] [PATCH 25/46] Use configure --mandir=DIR to set MANDIR

[Olaf Hering <olaf@xxxxxxxxx>]

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 Config.mk          | 1 -
 config/Paths.mk.in | 1 +
 config/StdGNU.mk   | 1 -
 config/SunOS.mk    | 1 -
 m4/paths.m4        | 4 ++++
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Config.mk b/Config.mk
index 75282d7..bb190f0 100644
--- a/Config.mk
+++ b/Config.mk
@@ -59,7 +59,6 @@ include $(XEN_ROOT)/config/$(XEN_OS).mk
 include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
 
 DOCDIR      ?= $(SHAREDIR)/doc/xen
-MANDIR      ?= $(SHAREDIR)/man
 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 4bded93..fe9ce8e 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -17,6 +17,7 @@ BINDIR                   := @BINDIR@
 LIBEXEC                  := @LIBEXEC@
 
 SHAREDIR                 := @SHAREDIR@
+MANDIR                   := @MANDIR@
 LIBDIR                   := @LIBDIR@
 
 XEN_RUN_DIR              := @XEN_RUN_DIR@
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index dd6170c..d6175c0 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -29,7 +29,6 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
 INCLUDEDIR = $(PREFIX)/include
-MANDIR = $(SHAREDIR)/man
 MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
 
diff --git a/config/SunOS.mk b/config/SunOS.mk
index 92bde78..94103fc 100644
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -21,7 +21,6 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
 INCLUDEDIR = $(PREFIX)/include
-MANDIR = $(PREFIX)/share/man
 MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
 
diff --git a/m4/paths.m4 b/m4/paths.m4
index 0255966..5e90eb4 100644
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -68,6 +68,10 @@ AC_SUBST(XEN_LIB_STORED)
 SHAREDIR=$prefix/share
 AC_SUBST(SHAREDIR)
 
+dnl double eval because default mandir includes datarootdir, which includes 
prefix
+MANDIR=`eval eval echo $mandir`
+AC_SUBST(MANDIR)
+
 PRIVATE_PREFIX=$LIBDIR/xen
 AC_SUBST(PRIVATE_PREFIX)
 

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