From 9d36851c174431e6ed861383ca9ffacbd67087d7 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 15 Dec 2010 10:17:51 -0500 Subject: add symlinks under JDK_HOME/jre/bin and make javaws work without them too 2010-12-15 Omair Majid * Makefile.am (install-exec-local): Install plugin.jar as data. If $(prefix)/jre/bin exists, then install symlinks to real javaws and itweb-settings binaries under it. ($(NETX_DIR)/launcher/%.o): Set system property java.icedtea-web.bin to point to the installed location of the javaws binary. * netx/net/sourceforge/jnlp/Launcher.java (launchExternal): Use the system property java.icedtea-web.bin to locate javaws binary. --- netx/net/sourceforge/jnlp/Launcher.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'netx/net/sourceforge') diff --git a/netx/net/sourceforge/jnlp/Launcher.java b/netx/net/sourceforge/jnlp/Launcher.java index 4d80252..11f0e12 100644 --- a/netx/net/sourceforge/jnlp/Launcher.java +++ b/netx/net/sourceforge/jnlp/Launcher.java @@ -329,11 +329,8 @@ public class Launcher { List commands = new LinkedList(); - String pathToWebstartBinary = System.getProperty("java.home") + - File.separatorChar + - "bin" + - File.separatorChar + - "javaws"; + // this property is set by the javaws launcher to point to the javaws binary + String pathToWebstartBinary = System.getProperty("java.icedtea-web.bin"); commands.add(pathToWebstartBinary); // use -Jargument format to pass arguments to the JVM through the launcher for (String arg : vmArgs) { -- cgit v1.2.3