Mercurial > hg > release > icedtea7-2.6
changeset 2988:946652f83ac1
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_.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 29 Apr 2019 21:27:13 +0100 |
| parents | 34da4e3e5b82 |
| children | 291f31c475c0 |
| files | ChangeLog Makefile.am NEWS policytool.desktop.in |
| diffstat | 4 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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):
--- 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