Index: guw/guw.cc
===================================================================
RCS file: /cvs/tools/config_office/guw/guw.cc,v
retrieving revision 1.3
retrieving revision 1.3.122.1
diff -u -u -r1.3 -r1.3.122.1
--- config_office/guw/guw.cc	24 Oct 2006 15:35:01 -0000	1.3
+++ config_office/guw/guw.cc	20 Sep 2007 03:09:12 -0000	1.3.122.1
@@ -84,10 +84,10 @@
                               "cl -clr: -Z",
                               "climaker StarOffice/OpenOffice",
                               "csc -target:",
-                              "ccache -DUDATA_SO_SUFFIX -DSTATIC_O"
-                                " -DLOCAL_RULE_LANGS",
+                              "g++ -DLOCAL_RULE_LANGS -DUPD -DMINOR"
+                                " -DBUILD_ID -DSC_INFO_OSVERSION",
                               "gcc -DUDATA_SO_SUFFIX -DSTATIC_O"
-                                " -DLOCAL_RULE_LANGS",
+                                " -DPACKAGE -DU_MAKE",
                               "lib /OUT: -out: -def: -machine:",
                               "link /BASE: /COMMENT: /DEBUG: /DLL /ENTRY:"
                                 " /MACHINE: /MAP /NODEFAULTLIB /OPT: /RELEASE"
@@ -278,7 +278,7 @@
     fullcommand.erase(slen-4);
 
   // get the program name - Only one subexpression
-  if (!match2s(fullcommand, "([[:alnum:]_~\\. \\-]+)$",
+  if (!match2s(fullcommand, "([[:alnum:]_~. +-]+)$",
                shortcommand, sub2)) {
     Fatal("No basename found in: " + fullcommand);
   }
