# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1556569633 -3600
# Node ID 946652f83ac1abef88404956f8693604c8f904b0
# Parent  34da4e3e5b8259d530d240ce20976ec2ae6bb2ff
PR3731: Use JRE bin directory in policytool.desktop.in

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

	PR3731: Use JRE bin directory in policytool.desktop.in
	* Makefile.am:
	(policytool-@JAVA_VER@.desktop): Replace _JREBINDIR_
	with the JRE bin directory ($(prefix)/jre/bin).
	* NEWS: Updated.
	* policytool.desktop.in: Use _JREBINDIR_ instead of
	_BINDIR_.

diff -r 34da4e3e5b82 -r 946652f83ac1 ChangeLog
--- a/ChangeLog	Mon Apr 29 21:25:18 2019 +0100
+++ b/ChangeLog	Mon Apr 29 21:27:13 2019 +0100
@@ -1,3 +1,13 @@
+2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3731: Use JRE bin directory in policytool.desktop.in
+	* Makefile.am:
+	(policytool-@JAVA_VER@.desktop): Replace _JREBINDIR_
+	with the JRE bin directory ($(prefix)/jre/bin).
+	* NEWS: Updated.
+	* policytool.desktop.in: Use _JREBINDIR_ instead of
+	_BINDIR_.
+
 2019-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3730: Change policytool.desktop.in category
diff -r 34da4e3e5b82 -r 946652f83ac1 Makefile.am
--- a/Makefile.am	Mon Apr 29 21:25:18 2019 +0100
+++ b/Makefile.am	Mon Apr 29 21:27:13 2019 +0100
@@ -3099,7 +3099,7 @@
 # File substitution
 
 policytool-@JAVA_VER@.desktop: policytool.desktop
-	cat $< | $(SED) "s#_BINDIR_#$(bindir)#" > $@
+	cat $< | $(SED) "s#_JREBINDIR_#$(prefix)/jre/bin#" > $@
 
 clean-policytool-@JAVA_VER@.desktop:
 	rm -f policytool-@JAVA_VER@.desktop
diff -r 34da4e3e5b82 -r 946652f83ac1 NEWS
--- a/NEWS	Mon Apr 29 21:25:18 2019 +0100
+++ b/NEWS	Mon Apr 29 21:27:13 2019 +0100
@@ -16,6 +16,7 @@
 
 * Bug fixes
   - PR3730: Change policytool.desktop.in category Development to Settings
+  - PR3731: Use JRE bin directory in policytool.desktop.in
 
 New in release 2.6.17 (2019-03-16):
 
diff -r 34da4e3e5b82 -r 946652f83ac1 policytool.desktop.in
--- a/policytool.desktop.in	Mon Apr 29 21:25:18 2019 +0100
+++ b/policytool.desktop.in	Mon Apr 29 21:27:13 2019 +0100
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Policy Tool
 Comment=Manage OpenJDK policy files
-Exec=_BINDIR_/policytool
+Exec=_JREBINDIR_/policytool
 Icon=java-@JAVA_VER@-@JAVA_VENDOR@
 Terminal=false
 Type=Application