From c29ac16a3dbd107ac965bfa5738bb0f51b6607bb Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 9 Jun 2016 15:11:31 -0400 Subject: [PATCH lttng-tools 1/3] Fix: Define MANPATH in config.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- configure.ac | 2 ++ src/common/Makefile.am | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e761d0b..ec1f7a0 100644 --- 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 193057c..8633730 100644 --- 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 -- 2.7.4