Mercurial > hg > icedtea8
changeset 2895:2a96d1a6ec76
PR3719: Use JRE bin directory in policytool.desktop.in
2019-04-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR3719: 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 | Wed, 17 Apr 2019 04:54:47 +0100 |
| parents | 6aa4ee6cd684 |
| children | 94efa0675e2d |
| files | ChangeLog Makefile.am NEWS policytool.desktop.in |
| diffstat | 4 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Apr 17 04:50:31 2019 +0100 +++ b/ChangeLog Wed Apr 17 04:54:47 2019 +0100 @@ -1,3 +1,13 @@ +2019-04-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR3719: 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> PR3718: Change policytool.desktop.in category
--- a/Makefile.am Wed Apr 17 04:50:31 2019 +0100 +++ b/Makefile.am Wed Apr 17 04:54:47 2019 +0100 @@ -2904,7 +2904,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 Wed Apr 17 04:50:31 2019 +0100 +++ b/NEWS Wed Apr 17 04:54:47 2019 +0100 @@ -76,6 +76,7 @@ - S8212821: CHECK_ must be used in the rhs of an assignment statement within a block (round 2) * Bug fixes - PR3718: Change policytool.desktop.in category Development to Settings + - PR3719: Use JRE bin directory in policytool.desktop.in * AArch64 port - S8221220, PR3724: AArch64: Add StoreStore membar explicitly for Volatile Writes in TemplateTable * Shenandoah
--- a/policytool.desktop.in Wed Apr 17 04:50:31 2019 +0100 +++ b/policytool.desktop.in Wed Apr 17 04:54:47 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