Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.3.2.2.2.9
diff -u -r1.3.2.2.2.9 set_soenv.in
--- config_office/set_soenv.in	2 Jan 2003 07:53:23 -0000	1.3.2.2.2.9
+++ config_office/set_soenv.in	11 Jan 2003 16:08:10 -0000
@@ -991,8 +991,8 @@
 {  $SOLARINCLUDES     = $I.$SOLARVER.$INC.
                         $I.$SOLARENV.$ds.$INPATH.$INC.
                         $I.$SOLARENV.$INC.
-                        $I.'$COMPATH'.$ds."include".
-                        $I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last
+                        $I."'".$PSDK_HOME.$INCLUDE."'".
+                        $I.'$COMPATH'.$ds."include";
 }
 elsif ($platform eq "$Macosx")
 {  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
@@ -1011,16 +1011,16 @@
                         $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$INC.
                         $ps.$SOLARENV.$ds.$OUTPATH.$INC.
                         $ps.$SOLARENV.$INC.
-                        $ps.'$COMPATH'.$INCLUDE.
-                        $ps.'$PSDK_HOME'.$INCLUDE; # This must be the last.
+                        $ps.'$PSDK_HOME'.$INCLUDE.
+                        $ps.'$COMPATH'.$INCLUDE;
 
    $WIN_LIB             = $cur_dir.$ps_STLPORT_LIB.$ps.
                         $ps.$SOLARVER.$ds.$UPD.$LIB.
                         $ps.$SOLARVER.$ds.$UPD.$ds.$INPATH.$LIB.
                         $ps.$SOLARENV.$ds.$OUTPATH.$LIB.
                         $ps.$JAVA_HOME.$LIB.
-                        $ps.'$COMPATH'.$LIB.
-                        $ps.'$PSDK_HOME'.$LIB;
+                        $ps.'$PSDK_HOME'.$LIB.
+                        $ps.'$COMPATH'.$LIB;
 
    if ( $JAVA_HOME ne "" )
    {
@@ -1299,8 +1299,8 @@
 {  $SOLARINC         .= $STLPORT_stlport.
                         $I.'$JAVA_HOME'.$ds."include".$ds."win32".
                         $I.'$JAVA_HOME'.$ds."include".
-                        $I.'$COMPATH'.$ds."include".
-                        $I."'".$PSDK_HOME.$INCLUDE."'"; # This must be the last.
+                        $I."'".$PSDK_HOME.$INCLUDE."'".
+                        $I.'$COMPATH'.$ds."include";
 }
 elsif ($platform eq "$Macosx")
 {  $SOLARINC         .= $STLPORT_stlport.