[lttng-dev] [PATCH v2 lttng-ust] Fix: Java Agent JAR file symlink should be created after objects install

[Mathieu Desnoyers]

Merged, thanks!

Mathieu

----- Original Message -----
> From: "Christian Babeux" <christian.babeux at efficios.com>
> To: lttng-dev at lists.lttng.org
> Cc: "mathieu desnoyers" <mathieu.desnoyers at efficios.com>, "Christian Babeux" <christian.babeux at efficios.com>
> Sent: Tuesday, November 4, 2014 4:28:19 PM
> Subject: [PATCH v2 lttng-ust] Fix: Java Agent JAR file symlink should be created after objects install
> 
> Signed-off-by: Christian Babeux <christian.babeux at efficios.com>
> ---
>  liblttng-ust-java-agent/java/Makefile.am | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/liblttng-ust-java-agent/java/Makefile.am
> b/liblttng-ust-java-agent/java/Makefile.am
> index 5a406e4..f9344bb 100644
> --- a/liblttng-ust-java-agent/java/Makefile.am
> +++ b/liblttng-ust-java-agent/java/Makefile.am
> @@ -46,7 +46,7 @@ classes += $(pkgpath)/log4j/*.class
>  endif
>  
>  $(jarfile): classnoinst.stamp
> -	$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && $(LN_S) $@
> $(jarfile_symlink)
> +	$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f
> $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
>  
>  $(jarfile_old): classnoinst.stamp
>  	$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class \
> @@ -62,11 +62,11 @@ log4j-jni-header.stamp: $(dist_noinst_JAVA)
>  
>  all-local: $(stamp)
>  
> -install-data-local:
> -	cd $(DESTDIR)/$(jardir); rm -f $(jarfile_symlink); $(LN_S) $(jarfile)
> $(jarfile_symlink)
> +install-data-hook:
> +	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile)
> $(jarfile_symlink)
>  
> -uninstall-local:
> -	cd $(DESTDIR)/$(jardir); rm -f $(jarfile_symlink)
> +uninstall-hook:
> +	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
>  
>  CLEANFILES = $(jarfile) $(jarfile_old) $(pkgpath)/*.class
>  $(pkgpath_old)/*.class $(pkgpath)/jul/*.class \
>  	$(pkgpath)/log4j/*.class jul-jni-header.stamp log4j-jni-header.stamp \
> --
> 2.1.1
> 
> 

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