]>
Commit | Line | Data |
---|---|---|
218ac5bf | 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 | |
3 | @@ -1193,10 +1193,7 @@ | |
4 | ||
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")) | |
6 | { | |
7 | -if ( ($platform ne "$Irix") and ($platform ne "$Irix64") ) | |
8 | -{ | |
9 | - $SOLARINC .= $I.$USR.$INCLUDE; | |
10 | -} | |
d43a1eb8 | 11 | +$SOLARINC .= $I.'$JAVA_HOME'.$INCLUDE; |
218ac5bf | 12 | $SOLARINC .= $STLPORT_stlport; |
13 | if ($platform eq "$Linux") | |
14 | { | |
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; | |
18 | } | |
19 | -$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". | |
20 | - $I.'$JAVA_HOME'.$INCLUDE; | |
21 | - | |
22 | -#include system dependent Java include directory | |
23 | - | |
24 | -if ($platform eq "$Solaris") | |
25 | -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."solaris"; | |
26 | -} | |
27 | -elsif (($platform eq "$Linux") or ($platform eq "$Tru64")) | |
28 | -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; | |
29 | -} | |
30 | -elsif ($platform eq "$FreeBSD") | |
31 | -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; | |
32 | -} | |
33 | -elsif ($platform eq "$NetBSD") | |
34 | -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; | |
35 | -} | |
36 | -elsif (($platform eq "$Irix") or ($platform eq "$Irix64")) | |
37 | -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix"; | |
38 | -} | |
39 | - | |
40 | -#java threads include path | |
41 | - | |
42 | -if ($platform eq "$FreeBSD") | |
43 | -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."green_threads".$ds."include"; | |
44 | -} | |
45 | -else | |
46 | -{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include"; | |
47 | -} | |
48 | +$SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31"; | |
49 | ||
50 | #The tail, if needed | |
51 | if (($platform eq "$Linux") or ($platform eq "$FreeBSD") or ($platform eq "$NetBSD")) | |
52 | -{ $SOLARINC .= $I.$XINC. | |
53 | - $I.$GCC_INCLUDE. | |
54 | - $I.$USR.$INCLUDE; | |
55 | +{ $SOLARINC .= $I.$XINC; | |
56 | } | |
57 | elsif ($platform eq "$Tru64") | |
58 | -{ $SOLARINC .= $I.$XINC. | |
59 | - $I.$USR.$INCLUDE; | |
60 | +{ $SOLARINC .= $I.$XINC; | |
61 | } | |
62 | elsif (($platform eq "$Irix") or ($platform eq "$Irix64")) | |
63 | -{ $SOLARINC .= $I.$GCC_INCLUDE. | |
64 | - $I.$GXX_INCLUDE. | |
65 | - $I.$XINC; | |
66 | +{ $SOLARINC .= $I.$XINC; | |
67 | } | |
68 | #add a '"' at the end | |
69 | $SOLARINC .= '"'; |