1 --- oo_1.0_src/config_office/set_soenv.1.bero Wed Jun 12 11:11:16 2002
2 +++ oo_1.0_src/config_office/set_soenv.1 Wed Jun 12 11:12:59 2002
5 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"))
7 -if ( ($platform ne "$Irix") and ($platform ne "$Irix64") )
9 - $SOLARINC .= $I.$USR.$INCLUDE;
11 +$SOLARINC .= $I.'$JAVA_HOME'.$INCLUDE;
12 $SOLARINC .= $STLPORT_stlport;
13 if ($platform eq "$Linux")
15 @@ -1217,50 +1213,17 @@
16 # This simply adds an include path, so even cases that break the FHS work
17 $SOLARINC .= $STLPORT_inc_stlport;
19 -$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
20 - $I.'$JAVA_HOME'.$INCLUDE;
22 -#include system dependent Java include directory
24 -if ($platform eq "$Solaris")
25 -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris";
27 -elsif (($platform eq "$Linux") or ($platform eq "$Tru64"))
28 -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
30 -elsif ($platform eq "$FreeBSD")
31 -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
33 -elsif ($platform eq "$NetBSD")
34 -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
36 -elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
37 -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
40 -#java threads include path
42 -if ($platform eq "$FreeBSD")
43 -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include";
46 -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
48 +$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31";
51 if (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD"))
52 -{ $SOLARINC .= $I.$XINC.
55 +{ $SOLARINC .= $I.$XINC;
57 elsif ($platform eq "$Tru64")
58 -{ $SOLARINC .= $I.$XINC.
60 +{ $SOLARINC .= $I.$XINC;
62 elsif (($platform eq "$Irix") or ($platform eq "$Irix64"))
63 -{ $SOLARINC .= $I.$GCC_INCLUDE.
66 +{ $SOLARINC .= $I.$XINC;