Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.1.4.12.2.1
diff -u -r1.1.4.12.2.1 set_soenv.in
--- config_office/set_soenv.in	15 Oct 2002 14:28:25 -0000	1.1.4.12.2.1
+++ config_office/set_soenv.in	20 Oct 2002 12:29:14 -0000
@@ -1033,7 +1033,7 @@
                         $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."'"; # This must be the last
 }
 elsif ($platform eq "$Macosx")
 {  $SOLARINCLUDES     = $I.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$INC.
@@ -1341,7 +1341,7 @@
                         $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."'"; # This must be the last.
 }
 elsif ($platform eq "$Macosx")
 {  $SOLARINC         .= $STLPORT_stlport.
@@ -2155,7 +2155,7 @@
 # Return value:  Reformatted String
 #----------------------------------------------------------
 sub WinFormat         
-{  my ( $variable, $d1, $d1_prefix, @split_var );  
+{  my ( $variable, $d1, $d1_prefix, $d1_fname, @split_var );  
    $variable = $_[ 0 ];
    $variable =~ s/^\s+//g ; #remove leading spaces
    $variable =~ s/\s+$//g ; #remove trailing spaces
@@ -2189,19 +2189,20 @@
            foreach $d1 ( @split_var )
            {
 			   $d1 = "-".$d1;
-               if ( $d1 =~ /^(-\w)(?:(?:\/[\w\.~ ]+)+)/ )
+               if ( $d1 =~ /^(-\w)[\'\"]?((?:\/[\w\.~ ]+)+)[\'\"]?/ )
+			   # This regex: option -> $1, filename without quotes -> $2
                {
                    $d1_prefix = $1;
-                   $d1 =~ s/^-\w//;
-				   if ( $d1 =~ / / )
+				   $d1_fname = $2;
+				   if ( $d1_fname =~ / / )
 				   {
-					   chomp( $d1 = qx{cygpath -d "$d1"} ); # Use DOS 8.3 style to avoid quoting
+					   chomp( $d1_fname = qx{cygpath -d "$d1_fname"} ); # Use DOS 8.3 style to avoid quoting
 				   }                                        # ! This fails when $d1 doesn't exist!
 				   else
 				   {
-					   chomp( $d1 = qx{cygpath -w "$d1"} ); # Use "normal" filenames
+					   chomp( $d1_fname = qx{cygpath -w "$d1_fname"} ); # Use "normal" filenames
 				   }
-                   $d1 = $d1_prefix.$d1;
+                   $d1 = $d1_prefix.$d1_fname;
                }
 			   else
 			   {   # relative paths here