Re: [PATCH lttng-ust] Fix: java-agent: out-of-tree path to java manifest

Re: [PATCH lttng-ust] Fix: java-agent: out-of-tree path to java manifest

[Mathieu Desnoyers]

Merged, thanks!

----- Original Message -----
> From: "Jonathan Rajotte" <jonathan.rajotte-julien@efficios.com>
> To: lttng-dev@lists.lttng.org
> Sent: Friday, January 23, 2015 1:22:11 PM
> Subject: [lttng-dev] [PATCH lttng-ust] Fix: java-agent: out-of-tree path to	java manifest
> 
> This should also be backported to stable-2.6.
> 
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
> ---
>  liblttng-ust-java-agent/java/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/liblttng-ust-java-agent/java/Makefile.am
> b/liblttng-ust-java-agent/java/Makefile.am
> index bcf6abe..399b533 100644
> --- a/liblttng-ust-java-agent/java/Makefile.am
> +++ b/liblttng-ust-java-agent/java/Makefile.am
> @@ -4,7 +4,7 @@ pkgpath = org/lttng/ust/agent
>  pkgpath_old = org/lttng/ust/jul
>  
>  jarfile_version = 1.0.0
> -jarfile_manifest = $(pkgpath)/Manifest.txt
> +jarfile_manifest = $(srcdir)/$(pkgpath)/Manifest.txt
>  jarfile_symlink = liblttng-ust-agent.jar
>  jarfile = liblttng-ust-agent-$(jarfile_version).jar
>  
> --
> 1.9.1
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev@lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
> 

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

[PATCH lttng-ust] Fix: java-agent: out-of-tree path to java manifest

[Jonathan Rajotte]

This should also be backported to stable-2.6.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
 liblttng-ust-java-agent/java/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liblttng-ust-java-agent/java/Makefile.am b/liblttng-ust-java-agent/java/Makefile.am
index bcf6abe..399b533 100644
--- a/liblttng-ust-java-agent/java/Makefile.am
+++ b/liblttng-ust-java-agent/java/Makefile.am
@@ -4,7 +4,7 @@ pkgpath = org/lttng/ust/agent
 pkgpath_old = org/lttng/ust/jul
 
 jarfile_version = 1.0.0
-jarfile_manifest = $(pkgpath)/Manifest.txt
+jarfile_manifest = $(srcdir)/$(pkgpath)/Manifest.txt
 jarfile_symlink = liblttng-ust-agent.jar
 jarfile = liblttng-ust-agent-$(jarfile_version).jar
 
-- 
1.9.1