# HG changeset patch # User Michal Vyskocil <mvyskocil@suse.cz> # Date 1310109401 -7200 # Branch topic # Node ID 035fde94821540dd26815e4ea0a244df8ddf6079 # Parent 86abbf8be0b103ec85f6723b6324281984a8bc2f use JRE in lanuchers instead of JAVA The @JAVA@ points to the SDK location used for build of icedtea-web. As the path of JRE might be different on some distributions, use @JRE@ to make webstart and itwen-settings usable with runtime only installed. Fixes https://bugzilla.novell.com/show_bug.cgi?id=704419#c1 diff --git a/launcher/itweb-settings.in b/launcher/itweb-settings.in --- a/launcher/itweb-settings.in +++ b/launcher/itweb-settings.in @@ -1,6 +1,6 @@ #!/bin/sh -JAVA=@JAVA@ +JAVA=@JRE/bin/java@ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ LAUNCHER_FLAGS=-Xms8m CLASSNAME=net.sourceforge.jnlp.controlpanel.CommandLine diff --git a/launcher/javaws.in b/launcher/javaws.in --- a/launcher/javaws.in +++ b/launcher/javaws.in @@ -1,6 +1,6 @@ #!/bin/sh -JAVA=@JAVA@ +JAVA=@JRE/bin/java@ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ LAUNCHER_FLAGS=-Xms8m CLASSNAME=net.sourceforge.jnlp.runtime.Boot