* [PATCH lttng-tools 1/3] Fix: Define MANPATH in config.h
@ 2016-06-09 19:11 Michael Jeanson
0 siblings, 0 replies; 2+ messages in thread
From: Michael Jeanson @ 2016-06-09 19:11 UTC (permalink / raw)
To: lttng-dev; +Cc: jgalar
Signed-off-by: Michael Jeanson <mjeanson@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
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH lttng-tools 1/3] Fix: Define MANPATH in config.h
[not found] <1465499493-29365-1-git-send-email-mjeanson@efficios.com>
@ 2016-06-14 18:56 ` Jérémie Galarneau
0 siblings, 0 replies; 2+ messages in thread
From: Jérémie Galarneau @ 2016-06-14 18:56 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev, Jeremie Galarneau
All three patches are merged, thanks!
Jérémie
On Thu, Jun 9, 2016 at 3:11 PM, Michael Jeanson <mjeanson@efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson@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
>
--
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-14 18:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-09 19:11 [PATCH lttng-tools 1/3] Fix: Define MANPATH in config.h Michael Jeanson
[not found] <1465499493-29365-1-git-send-email-mjeanson@efficios.com>
2016-06-14 18:56 ` Jérémie Galarneau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.