Mercurial > hg > icedtea8

changeset 2896:94efa0675e2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3722: Use SDK bin directory in jconsole.desktop.in 2019-04-16 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3722: Use SDK bin directory in jconsole.desktop.in * Makefile.am: (jconsole-@JAVA_VER@.desktop): Replace _SDKBINDIR_ with the SDK bin directory ($(bindir)). * NEWS: Updated. * jconsole.desktop.in: Use _SDKBINDIR_ instead of _BINDIR_.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 17 Apr 2019 04:59:02 +0100
parents 2a96d1a6ec76
children 881ab2aacbee
files ChangeLog Makefile.am NEWS jconsole.desktop.in
diffstat 4 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Apr 17 04:54:47 2019 +0100
+++ b/ChangeLog	Wed Apr 17 04:59:02 2019 +0100
@@ -1,3 +1,13 @@
+2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3722: Use SDK bin directory in jconsole.desktop.in
+	* Makefile.am:
+	(jconsole-@JAVA_VER@.desktop): Replace _SDKBINDIR_
+	with the SDK bin directory ($(bindir)).
+	* NEWS: Updated.
+	* jconsole.desktop.in: Use _SDKBINDIR_ instead of
+	_BINDIR_.
+
 2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3719: Use JRE bin directory in policytool.desktop.in
--- a/Makefile.am	Wed Apr 17 04:54:47 2019 +0100
+++ b/Makefile.am	Wed Apr 17 04:59:02 2019 +0100
@@ -2910,7 +2910,7 @@
 	rm -f policytool-@JAVA_VER@.desktop
 
 jconsole-@JAVA_VER@.desktop: jconsole.desktop
-	cat $< | $(SED) "s#_BINDIR_#$(bindir)#" > $@
+	cat $< | $(SED) "s#_SDKBINDIR_#$(bindir)#" > $@
 
 clean-jconsole-@JAVA_VER@.desktop:
 	rm -f jconsole-@JAVA_VER@.desktop
--- a/NEWS	Wed Apr 17 04:54:47 2019 +0100
+++ b/NEWS	Wed Apr 17 04:59:02 2019 +0100
@@ -77,6 +77,7 @@
 * Bug fixes
   - PR3718: Change policytool.desktop.in category Development to Settings
   - PR3719: Use JRE bin directory in policytool.desktop.in
+  - PR3722: Use SDK bin directory in jconsole.desktop.in
 * AArch64 port
   - S8221220, PR3724: AArch64: Add StoreStore membar explicitly for Volatile Writes in TemplateTable
 * Shenandoah
--- a/jconsole.desktop.in	Wed Apr 17 04:54:47 2019 +0100
+++ b/jconsole.desktop.in	Wed Apr 17 04:59:02 2019 +0100
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Monitoring & Management Console
 Comment=Monitor and manage OpenJDK applications
-Exec=_BINDIR_/jconsole
+Exec=_SDKBINDIR_/jconsole
 Icon=java-@JAVA_VER@-@JAVA_VENDOR@
 Terminal=false
 Type=Application