diff mbox

[lttng-tools,1/3] Fix: Define MANPATH in config.h

Message ID 1465499493-29365-1-git-send-email-mjeanson@efficios.com
State Accepted, archived
Headers show

Commit Message

Michael Jeanson June 9, 2016, 7:11 p.m. UTC
Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 configure.ac           | 2 ++
 src/common/Makefile.am | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Jérémie Galarneau June 14, 2016, 6:56 p.m. UTC | #1
All three patches are merged, thanks!

Jérémie

On Thu, Jun 9, 2016 at 3:11 PM, Michael Jeanson <mjeanson at efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  configure.ac           | 2 ++
>  src/common/Makefile.am | 3 +--
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index c94da7a..d6149fe 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
>
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index c94da7a..d6149fe 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