diff options
| author |   Eric Hameleers <alien@slackware.com> | 2020-04-22 09:56:55 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-04-22 09:56:55 +0000 |
| commit | 53ab9badc3ef2939be82590c3af26d023d4d552f (patch) | |
| tree | b7dd1b3d41aedc8fa862ec4882351bc826342533 /openjdk | |
| parent | 6ba9ef90bcfbf07de5dce4cdb8bfcc05e386c8a8 (diff) | |
| download | asb-53ab9badc3ef2939be82590c3af26d023d4d552f.tar.gz asb-53ab9badc3ef2939be82590c3af26d023d4d552f.tar.xz | |
openjdk: fix the desktop menu files. Also, jconsole is not part of JRE
Diffstat (limited to 'openjdk')
| -rwxr-xr-x | openjdk/build/openjdk.SlackBuild | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild index 918f8ca8..3b7760e6 100755 --- a/openjdk/build/openjdk.SlackBuild +++ b/openjdk/build/openjdk.SlackBuild @@ -279,10 +279,17 @@ for i in 16 24 32 48 ; do ${PKG2}/usr/share/icons/hicolor/${i}x${i}/apps/java.png done mkdir -p ${PKG1}/usr/share/applications ${PKG2}/usr/share/applications +# First, fix the desktop files: for DTFILE in jconsole policytool ; do - install -m644 ${DTFILE}.desktop ${PKG1}/usr/share/applications/ - install -m644 ${DTFILE}.desktop ${PKG2}/usr/share/applications/ + sed -i ${DTFILE}.desktop \ + -e "s,_SDKBINDIR_,/usr/lib${LIBDIRSUFFIX}/java/bin," \ + -e "s,_JREBINDIR_,/usr/lib${LIBDIRSUFFIX}/java/jre/bin," done +# jconsole is only present in the SDK: +install -m644 jconsole.desktop ${PKG1}/usr/share/applications/ +install -m644 policytool.desktop ${PKG1}/usr/share/applications/ +install -m644 policytool.desktop ${PKG2}/usr/share/applications/ + # We do not create symlinks for binaries in /usr/bin , instead we add the # Java directory to the $PATH : for FILE in ${PKG1}/usr/share/applications/*.desktop \ |