Use configure --mandir=DIR to set MANDIR

Also move common MAN8DIR and MAN1DIR to Paths.mk.in

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>

diff --git a/Config.mk b/Config.mk
index 9bda626a55aadb0bbbb1d9dae8f40768322df9af..b8afa433f03c673a97718e6302913c35d9624923 100644 (file)
--- 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 c3c9897b51d6916658f9530875a11fff040c47df..3ba4f772f8100e5eaf5f534e86f372413553f243 100644 (file)
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -34,6 +34,9 @@ BINDIR                   := $(bindir)
 LIBEXEC                  := @LIBEXEC@
 
 SHAREDIR                 := @SHAREDIR@
+MANDIR                   := $(mandir)
+MAN1DIR                  := $(MANDIR)/man1
+MAN8DIR                  := $(MANDIR)/man8
 LIBDIR                   := $(libdir)
 
 XEN_RUN_DIR              := @XEN_RUN_DIR@

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index dd6170cd7ff2fe405e21ec3db42ca1aa60b35064..bcf02ea40d73e3f5b31d49b6496137ef5fbb0795 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -29,9 +29,6 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
 INCLUDEDIR = $(PREFIX)/include
-MANDIR = $(SHAREDIR)/man
-MAN1DIR = $(MANDIR)/man1
-MAN8DIR = $(MANDIR)/man8
 
 SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
 

diff --git a/config/SunOS.mk b/config/SunOS.mk
index 92bde7806c5da31b484a5b154f524683f21dab8a..c88fc2afb0987cef87b582a3f4d4c9aa621edc39 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -21,9 +21,6 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
 INCLUDEDIR = $(PREFIX)/include
-MANDIR = $(PREFIX)/share/man
-MAN1DIR = $(MANDIR)/man1
-MAN8DIR = $(MANDIR)/man8
 
 BOOT_DIR ?= /boot