# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1556569755 -3600
# Node ID 291f31c475c0aeba5462c3cac93f5bf5c49767ed
# Parent  946652f83ac1abef88404956f8693604c8f904b0
PR3732: Use SDK bin directory in jconsole.desktop.in

2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR3732: 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_.

diff -r 946652f83ac1 -r 291f31c475c0 ChangeLog
--- a/ChangeLog	Mon Apr 29 21:27:13 2019 +0100
+++ b/ChangeLog	Mon Apr 29 21:29:15 2019 +0100
@@ -1,3 +1,13 @@
+2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3732: 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>
 
 	PR3731: Use JRE bin directory in policytool.desktop.in
diff -r 946652f83ac1 -r 291f31c475c0 Makefile.am
--- a/Makefile.am	Mon Apr 29 21:27:13 2019 +0100
+++ b/Makefile.am	Mon Apr 29 21:29:15 2019 +0100
@@ -3105,7 +3105,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
diff -r 946652f83ac1 -r 291f31c475c0 NEWS
--- a/NEWS	Mon Apr 29 21:27:13 2019 +0100
+++ b/NEWS	Mon Apr 29 21:29:15 2019 +0100
@@ -17,6 +17,7 @@
 * Bug fixes
   - PR3730: Change policytool.desktop.in category Development to Settings
   - PR3731: Use JRE bin directory in policytool.desktop.in
+  - PR3732: Use SDK bin directory in jconsole.desktop.in
 
 New in release 2.6.17 (2019-03-16):
 
diff -r 946652f83ac1 -r 291f31c475c0 jconsole.desktop.in
--- a/jconsole.desktop.in	Mon Apr 29 21:27:13 2019 +0100
+++ b/jconsole.desktop.in	Mon Apr 29 21:29:15 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