From: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>
Date: Thu, 25 Aug 2016 19:57:46 +0000 (-0400)
Subject: Use -M parameter instead of --manpath when invoking man(1)
X-Git-Tag: v2.8.2~22
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f15c64e360863a01ad93dd3ee75bf582ac77c441;p=lttng-tools.git

Use -M parameter instead of --manpath when invoking man(1)

Older versions of man (and the implementation used in FreeBSD) do
not support the long version of the --manpath/-M option. Use
'-M' in the interest of portability.

Fixes #1043

Signed-off-by: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/utils.c b/src/common/utils.c
index 1e52ae0aa..16d2f817a 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1375,11 +1375,11 @@ int utils_show_man_page(int section, const char *page_name)
 	/*
 	 * Execute man pager.
 	 *
-	 * We provide --manpath to man here because LTTng-tools can
+	 * We provide -M to man here because LTTng-tools can
 	 * be installed outside /usr, in which case its man pages are
 	 * not located in the default /usr/share/man directory.
 	 */
-	ret = execlp(man_bin_path, "man", "--manpath", MANPATH,
+	ret = execlp(man_bin_path, "man", "-M", MANPATH,
 		section_string, page_name, NULL);
 	return ret;
 }