Fix: Define MANPATH in config.h

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index e761d0bcf27ad590a65c671a62b2b30ef14346ef..ec1f7a07cae71ab6ca21e97fc874f69dfed1292f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -621,6 +621,8 @@ and installing the man pages.
 AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
 AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
 
+AC_DEFINE_UNQUOTED([MANPATH], ["`eval eval echo $mandir`"], [Path to man pages.])
+
 # Python agent test
 UST_PYTHON_AGENT="lttngust"
 

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 193057c9b450b62ee130a8df7063e088462b9e8e..8633730a92b102baee5ee59f8b5b226e241750d7 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-       -DMANPATH=\""$(mandir)"\"
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
 
 AUTOMAKE_OPTIONS = subdir-objects