Index: inc/unxfbsdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
retrieving revision 1.7.50.1
diff -u -r1.7.50.1 unxfbsdi.mk
--- inc/unxfbsdi.mk	13 Oct 2003 19:15:08 -0000	1.7.50.1
+++ inc/unxfbsdi.mk	30 Oct 2003 20:29:04 -0000
@@ -69,6 +69,7 @@
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
 
 # this is a platform with JAVA support
+SOLAR_JAVA*=TRUE
 .IF "$(SOLAR_JAVA)"!=""
 JAVADEF=-DSOLAR_JAVA
 .IF "$(debug)"==""
Index: inc/unxirxm3.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxirxm3.mk,v
retrieving revision 1.5.84.1
diff -u -r1.5.84.1 unxirxm3.mk
--- inc/unxirxm3.mk	16 Oct 2003 18:08:16 -0000	1.5.84.1
+++ inc/unxirxm3.mk	30 Oct 2003 20:29:05 -0000
@@ -65,7 +65,7 @@
 ASM=
 AFLAGS=
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 JAVADEF=-DSOLAR_JAVA
 #JAVAFLAGSDEBUG=-g
 
Index: inc/unxlngi3.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxlngi3.mk,v
retrieving revision 1.20
diff -u -r1.20 unxlngi3.mk
--- inc/unxlngi3.mk	28 Apr 2003 16:46:48 -0000	1.20
+++ inc/unxlngi3.mk	30 Oct 2003 20:29:05 -0000
@@ -64,7 +64,7 @@
 ASM=
 AFLAGS=
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
Index: inc/unxlngi4.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxlngi4.mk,v
retrieving revision 1.19.18.1
diff -u -r1.19.18.1 unxlngi4.mk
--- inc/unxlngi4.mk	15 Aug 2003 12:06:59 -0000	1.19.18.1
+++ inc/unxlngi4.mk	30 Oct 2003 20:29:05 -0000
@@ -64,7 +64,7 @@
 ASM=
 AFLAGS=
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
Index: inc/unxlngi5.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxlngi5.mk,v
retrieving revision 1.5.26.1
diff -u -r1.5.26.1 unxlngi5.mk
--- inc/unxlngi5.mk	15 Aug 2003 12:07:08 -0000	1.5.26.1
+++ inc/unxlngi5.mk	30 Oct 2003 20:29:05 -0000
@@ -64,7 +64,7 @@
 ASM=
 AFLAGS=
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
Index: inc/unxlngppc.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxlngppc.mk,v
retrieving revision 1.11
diff -u -r1.11 unxlngppc.mk
--- inc/unxlngppc.mk	28 Apr 2003 16:47:14 -0000	1.11
+++ inc/unxlngppc.mk	30 Oct 2003 20:29:05 -0000
@@ -65,7 +65,7 @@
 ASM= 
 AFLAGS= 
 
-SOLAR_JAVA=TRUE 
+SOLAR_JAVA*=TRUE 
 JAVAFLAGSDEBUG=-g 
 
 # filter for supressing verbose messages from linker
Index: inc/unxlngppc4.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxlngppc4.mk,v
retrieving revision 1.5
diff -u -r1.5 unxlngppc4.mk
--- inc/unxlngppc4.mk	12 Jun 2003 10:02:32 -0000	1.5
+++ inc/unxlngppc4.mk	30 Oct 2003 20:29:05 -0000
@@ -64,7 +64,7 @@
 ASM=
 AFLAGS=
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
Index: inc/unxlngs3904.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxlngs3904.mk,v
retrieving revision 1.4
diff -u -r1.4 unxlngs3904.mk
--- inc/unxlngs3904.mk	12 Jun 2003 10:02:43 -0000	1.4
+++ inc/unxlngs3904.mk	30 Oct 2003 20:29:05 -0000
@@ -64,7 +64,7 @@
 ASM=
 AFLAGS=
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 JAVAFLAGSDEBUG=-g
 
 # filter for supressing verbose messages from linker
Index: inc/unxmacxp.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxmacxp.mk,v
retrieving revision 1.43.8.1
diff -u -r1.43.8.1 unxmacxp.mk
--- inc/unxmacxp.mk	15 Aug 2003 12:07:17 -0000	1.43.8.1
+++ inc/unxmacxp.mk	30 Oct 2003 20:29:05 -0000
@@ -82,6 +82,7 @@
 # STATICLIB=-l$(STATICLIBNAME)
 
 # MacOS X specific Java compilation/link flags
+SOLAR_JAVA*=TRUE
 .IF "$(SOLAR_JAVA)"!=""
 	JAVADEF=-DSOLAR_JAVA
 	JAVAFLAGSDEBUG=-g
Index: inc/unxsoli3.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxsoli3.mk,v
retrieving revision 1.14
diff -u -r1.14 unxsoli3.mk
--- inc/unxsoli3.mk	28 Apr 2003 16:48:31 -0000	1.14
+++ inc/unxsoli3.mk	30 Oct 2003 20:29:06 -0000
@@ -67,6 +67,7 @@
 
 CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=400
 
+SOLAR_JAVA*=TRUE
 .IF "$(SOLAR_JAVA)"!=""
 JAVADEF=-DSOLAR_JAVA
 JAVAFLAGSDEBUG=-g
Index: inc/unxsoli4.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxsoli4.mk,v
retrieving revision 1.2
diff -u -r1.2 unxsoli4.mk
--- inc/unxsoli4.mk	2 Jul 2003 13:44:47 -0000	1.2
+++ inc/unxsoli4.mk	30 Oct 2003 20:29:06 -0000
@@ -67,6 +67,7 @@
 
 CDEFS+=-mt -D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=400
 
+SOLAR_JAVA*=TRUE
 .IF "$(SOLAR_JAVA)"!=""
 JAVADEF=-DSOLAR_JAVA
 JAVAFLAGSDEBUG=-g
Index: inc/unxsols3.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxsols3.mk,v
retrieving revision 1.25
diff -u -r1.25 unxsols3.mk
--- inc/unxsols3.mk	28 Apr 2003 16:48:48 -0000	1.25
+++ inc/unxsols3.mk	30 Oct 2003 20:29:06 -0000
@@ -67,6 +67,7 @@
 
 CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=400
 
+SOLAR_JAVA*=TRUE
 .IF "$(SOLAR_JAVA)"!=""
 JAVADEF=-DSOLAR_JAVA
 JAVAFLAGSDEBUG=-g
Index: inc/unxsols4.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxsols4.mk,v
retrieving revision 1.8.12.1
diff -u -r1.8.12.1 unxsols4.mk
--- inc/unxsols4.mk	15 Aug 2003 12:07:27 -0000	1.8.12.1
+++ inc/unxsols4.mk	30 Oct 2003 20:29:06 -0000
@@ -67,6 +67,7 @@
 
 CDEFS+=-mt -D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=400
 
+SOLAR_JAVA*=TRUE
 .IF "$(SOLAR_JAVA)"!=""
 JAVADEF=-DSOLAR_JAVA
 JAVAFLAGSDEBUG=-g
Index: inc/wnt.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/wnt.mk,v
retrieving revision 1.52.26.1.4.1
diff -u -r1.52.26.1.4.1 wnt.mk
--- inc/wnt.mk	9 Oct 2003 08:51:17 -0000	1.52.26.1.4.1
+++ inc/wnt.mk	30 Oct 2003 20:29:06 -0000
@@ -60,7 +60,7 @@
 #
 #*************************************************************************
 
-SOLAR_JAVA=TRUE
+SOLAR_JAVA*=TRUE
 FULL_DESK=TRUE
 JAVAFLAGSDEBUG=-g