summaryrefslogtreecommitdiffstats
path: root/openjdk/build/openjdk.SlackBuild
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-08-21 12:04:21 +0000
committer Eric Hameleers <alien@slackware.com>2016-08-21 12:04:21 +0000
commitbaf6da866fd82120bd8489173eb799c10b512d7b (patch)
tree6b7301e0b31b575d143cd225ab99fd9f113d4c8e /openjdk/build/openjdk.SlackBuild
parent85ab3d055eaafada64527b04ce97d1f882af1c46 (diff)
downloadasb-baf6da866fd82120bd8489173eb799c10b512d7b.tar.gz
asb-baf6da866fd82120bd8489173eb799c10b512d7b.tar.xz
openjdk: fix double (and broken) .desktop files
Diffstat (limited to 'openjdk/build/openjdk.SlackBuild')
-rwxr-xr-xopenjdk/build/openjdk.SlackBuild12
1 files changed, 7 insertions, 5 deletions
diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild
index b6d96a89..72b46d5c 100755
--- a/openjdk/build/openjdk.SlackBuild
+++ b/openjdk/build/openjdk.SlackBuild
@@ -277,15 +277,17 @@ for i in 16 24 32 48 ; do
install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${i}.png \
${PKG2}/usr/share/icons/hicolor/${i}x${i}/apps/java.png
done
-mkdir -p ${PKG1}/usr/share/applications
-install -m644 *.desktop ${PKG1}/usr/share/applications/
-mkdir -p ${PKG2}/usr/share/applications
-install -m644 *.desktop ${PKG2}/usr/share/applications/
+mkdir -p ${PKG1}/usr/share/applications ${PKG2}/usr/share/applications
+for DTFILE in jconsole policytool ; do
+ install -m644 ${DTFILE}.desktop ${PKG1}/usr/share/applications/
+ install -m644 ${DTFILE}.desktop ${PKG2}/usr/share/applications/
+done
# 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 \
${PKG2}/usr/share/applications/*.desktop ; do
- sed -i -e "s,^Exec=/usr/bin/,Exec=," $FILE
+ sed -i -e "s,^Exec=/usr/bin/,Exec=," -e "s,^Exec=_BINDIR_/,Exec=," \
+ -e "s,^Exec=/usr/local/bin/,Exec=," $FILE
done
# User-modifiable configuration files go to /etc :