--- oo_1.0_src/config_office/set_soenv.1.bero	Wed Jun 12 11:11:16 2002
+++ oo_1.0_src/config_office/set_soenv.1	Wed Jun 12 11:12:59 2002
@@ -1193,10 +1193,7 @@
 
 if (($platform eq "$Solaris") or ($platform eq "$Linux") or ($platform eq "$Tru64") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD") or ($platform eq "$Irix") or ($platform eq "$Irix64"))
 {
-if ( ($platform ne "$Irix") and ($platform ne "$Irix64") )
-{
-	$SOLARINC            .= $I.$USR.$INCLUDE;
-}
+$SOLARINC .= $I.'$JAVA_HOME'.$INCLUDE;
 $SOLARINC	     .= $STLPORT_stlport;
 if ($platform eq "$Linux")
 {
@@ -1217,50 +1213,17 @@
 # This simply adds an include path, so even cases that break the FHS work
 $SOLARINC            .= $STLPORT_inc_stlport;
 }
-$SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31".
-                        $I.'$JAVA_HOME'.$INCLUDE;
-
-#include system dependent Java include directory
-
-if ($platform eq "$Solaris")
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
-}
-elsif  (($platform eq "$Linux") or ($platform eq "$Tru64"))
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
-}
-elsif ($platform eq "$FreeBSD")
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
-}
-elsif ($platform eq "$NetBSD")
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
-}
-elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
-}
-
-#java threads include path
-
-if ($platform eq "$FreeBSD")
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include";
-}
-else
-{  $SOLARINC          .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
-}
+$SOLARINC            .= $I.'$SOLARENV'.$INC.$ds."Xp31";
 
 #The tail, if needed
 if (($platform eq "$Linux") or  ($platform eq "$FreeBSD") or ($platform eq "$NetBSD"))
-{  $SOLARINC         .= $I.$XINC.
-                        $I.$GCC_INCLUDE.
-                        $I.$USR.$INCLUDE;
+{  $SOLARINC         .= $I.$XINC;
 }
 elsif ($platform eq "$Tru64") 
-{  $SOLARINC         .= $I.$XINC.
-                        $I.$USR.$INCLUDE;
+{  $SOLARINC         .= $I.$XINC;
 }
 elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
-{  $SOLARINC         .= $I.$GCC_INCLUDE.
-                       $I.$GXX_INCLUDE.
-                       $I.$XINC;
+{  $SOLARINC         .= $I.$XINC;
 }
 #add a '"' at the end
 $SOLARINC            .= '"';