From 37ba5eaeb60df4ed113efe1e4cc33cedfa0955ea Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 11 Apr 2016 22:24:25 -0400 Subject: [PATCH] Fix: add version to lttng-ust-agent-all jar file Signed-off-by: Mathieu Desnoyers --- .../java/lttng-ust-agent-all/Makefile.am | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am index 1dd3b86d..cf3f3c3b 100644 --- a/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am +++ b/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am @@ -1,7 +1,9 @@ JAVAROOT = . +jarfile_version = 1.0.0 jarfile_manifest = $(srcdir)/Manifest.txt -jarfile = lttng-ust-agent-all.jar +jarfile_symlink = lttng-ust-agent-all.jar +jarfile = lttng-ust-agent-all-$(jarfile_version).jar # Compatibility symlink provided for applications expecting the agent # jar file installed by UST 2.7. @@ -14,11 +16,14 @@ dist_noinst_DATA = $(jarfile_manifest) jar_DATA = $(jarfile) $(jarfile): - $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) && rm -f $(jarfile_compat_symlink) && $(LN_S) $@ $(jarfile_compat_symlink) + $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) \ + && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink) \ + && rm -f $(jarfile_compat_symlink) && $(LN_S) $(jarfile_symlink) $(jarfile_compat_symlink) install-data-hook: - cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_compat_symlink) && $(LN_S) $(jarfile) $(jarfile_compat_symlink) + cd $(DESTDIR)/$(jardir) \ + && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink) \ + && rm -f $(jarfile_compat_symlink) && $(LN_S) $(jarfile_symlink) $(jarfile_compat_symlink) uninstall-hook: - cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_compat_symlink) - + cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && rm -f $(jarfile_compat_symlink) -- 2.34.1