From: Sebastien Godard <sysstat@orange.fr>
Date: Tue, 21 Sep 2010 19:52:17 +0000 (+0200)
Subject: Moved manual pages from $prefix/man to $prefix/share/man.
X-Git-Tag: v9.1.6~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de47bed78ec2b134ef3a953484a89d8a58dd3e4f;p=sysstat

Moved manual pages from $prefix/man to $prefix/share/man.

Mail from Ivana Varekova (21/09/2010).
The Linux Filesystem Hierarchy now defines the default location for
manual pages as /usr/share/man instead of /usr/man.
So update sysstat to reflect this change.
See: http://tldp.org/LDP/Linux-Filesystem-Hierarchy/html/Linux-Filesystem-Hierarchy.html#usr
---

diff --git a/CHANGES b/CHANGES
index c735411..6ace908 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ Changes:
 
 xxxx/xx/xx: Version 9.1.6 - Sebastien Godard (sysstat <at> orange.fr)
 	* Added hugepages utilization statistics to sar.
+	* [Ivana Varekova]: Moved manual pages to $prefix/share/man
+	  instead of $prefix/man.
 	* sar manual page updated.
 	* DTD and XSD documents updated.
 	* Made sysstat git aware.
diff --git a/Makefile.in b/Makefile.in
index d9b1261..f897d50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,9 +46,8 @@ BIN_DIR = @bindir@
 
 ifndef MAN_DIR
 # With recent versions of autoconf, mandir defaults to ${datarootdir}/man
-# (i.e. $prefix/share/man) which is not necessarily in man path!
-# MAN_DIR = @mandir@
-MAN_DIR = @AuxMandir@
+# (i.e. $prefix/share/man)
+MAN_DIR = @mandir@
 endif
 MAN1_DIR = $(MAN_DIR)/man1
 MAN8_DIR = $(MAN_DIR)/man8
diff --git a/configure b/configure
index 97b9968..8bf0d8c 100755
--- a/configure
+++ b/configure
@@ -639,7 +639,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 DFLAGS
 WITH_DEBUG
-AuxMandir
 INSTALL_DOC
 REM_CHOWN
 QUOTE
@@ -7737,11 +7736,6 @@ $as_echo "$AUX_DOC" >&6; }
 
 
 # Set directory for installing manual pages (see comment in Makefile)
-if test $mandir != "\${datarootdir}/man"; then
-	AuxMandir=$mandir
-else
-	AuxMandir=$AuxPrefix/man
-fi
 
 
 # Check whether --debuginfo options should be allowed
@@ -8942,7 +8936,7 @@ echo "
    rc directory:		${RC_DIR}
    Init directory:		${INIT_DIR}
    Configuration directory:	${SYSCONFIG_DIR}
-   Man pages directory:		$AuxMandir
+   Man pages directory:		$mandir
    Compiler:			$CC
    Compiler flags:		$CFLAGS
 "
diff --git a/configure.in b/configure.in
index 79c2ec3..b5b4692 100644
--- a/configure.in
+++ b/configure.in
@@ -475,12 +475,7 @@ AC_MSG_RESULT($AUX_DOC)
 AC_SUBST(INSTALL_DOC)
 
 # Set directory for installing manual pages (see comment in Makefile)
-if test $mandir != "\${datarootdir}/man"; then
-	AuxMandir=$mandir
-else
-	AuxMandir=$AuxPrefix/man
-fi
-AC_SUBST(AuxMandir)
+AC_SUBST(mandir)
 
 # Check whether --debuginfo options should be allowed
 AC_ARG_ENABLE(debuginfo, 
@@ -521,7 +516,7 @@ echo "
    rc directory:		${RC_DIR}
    Init directory:		${INIT_DIR}
    Configuration directory:	${SYSCONFIG_DIR}
-   Man pages directory:		$AuxMandir
+   Man pages directory:		$mandir
    Compiler:			$CC
    Compiler flags:		$CFLAGS
 "