Changeset 431 for trunk/icedtea-web/Config.kmk

Timestamp:

Oct 2, 2014, 1:13:59 AM (11 years ago)

Author:

dmik

Message:

icedtea-web: Adapt 1.5.1 changes to OS/2.

File:

• trunk/icedtea-web/Config.kmk (modified) (3 diffs)

trunk/icedtea-web/Config.kmk

@@ -9 +9 @@
 PACKAGE_NAME       := icedtea-web
 PACKAGE_VER_MAJOR  := 1
-PACKAGE_VER_MINOR  := 3
-PACKAGE_VER_PATCH  := 0
+PACKAGE_VER_MINOR  := 5
+PACKAGE_VER_PATCH  := 1
 PACKAGE_VERSION    := $(PACKAGE_VER_MAJOR).$(PACKAGE_VER_MINOR).$(PACKAGE_VER_PATCH)
 PACKAGE_STRING     := $(PACKAGE_NAME) $(PACKAGE_VERSION)
@@ -30 +30 @@
 #ICEDTEA_WEB_DATA_DIR    := /@unixroot/usr/share/$(PACKAGE_NAME)
 
-ICEDTEA_WEB_JRE     = icedtea_web_jre_dir()
+ICEDTEA_WEB_JRE     = ""
 
 #
@@ -39 +39 @@
 #  - we want full privileges
 #
-LAUNCHER_BOOTCLASSPATH  = \"-Xbootclasspath/a:%s/netx.jar$(RHINO_RUNTIME)\", \
-                          icedtea_web_data_dir()
-PLUGIN_BOOTCLASSPATH    = \"-Xbootclasspath/a:%s/netx.jar;%s/plugin.jar$(RHINO_RUNTIME)\", \
-                          icedtea_web_data_dir(), icedtea_web_data_dir()
+LAUNCHER_BOOTCLASSPATH  = \"-Xbootclasspath/a:%s/netx.jar$(RHINO_RUNTIME)\"
+PLUGIN_BOOTCLASSPATH    = \"-Xbootclasspath/a:@DATADIR@/netx.jar;@DATADIR@/plugin.jar$(RHINO_RUNTIME)\"
 
 # Fake update version to work with the Deployment Toolkit script used by Oracle