--- a/src/share/tools/ProjectCreator/BuildConfig.java	Wed Feb 16 15:13:34 2011 +0100
+++ b/src/share/tools/ProjectCreator/BuildConfig.java	Mon Feb 21 19:17:10 2011 +0100
@@ -61,7 +61,20 @@
         // ones mentioned above were needed to expand format
         String buildBase = expandFormat(getFieldString(null, "BuildBase"));
         String sourceBase = getFieldString(null, "SourceBase");
-        String outDir = buildBase;
+        String outDir = sourceBase + Util.sep + "java";
+	if (Util.os().equals("x64")) {
+		outDir += "64";
+	}
+	if (!build.equals("product")) {
+		outDir += Util.sep + "fastdebug";
+	}
+	outDir += Util.sep + "jre" + Util.sep + "bin";
+	if (flavour.equals("compiler1")) {
+		outDir += Util.sep + "client";
+	} else {
+		outDir += Util.sep + "server";
+	}
+	buildBase = outDir;
 
         put("Id", flavourBuild);
         put("OutputDir", outDir);
@@ -252,22 +265,25 @@
 
     void initDefaultDefines(Vector defines) {
         Vector sysDefines = new Vector();
+
         if( Util.os().equals("Win32")) {
-        	sysDefines.add("WIN32");
+            sysDefines.add("WIN32");
             sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\"");
         } else {
-        	sysDefines.add("_AMD64_");
-        	sysDefines.add("AMD64");
-        	sysDefines.add("_WIN64");
-        	sysDefines.add("_LP64");
-        	if (System.getenv("MSC_VER") != null)
-        		sysDefines.add("MSC_VER=" + System.getenv("MSC_VER"));
+            sysDefines.add("_AMD64_");
+            sysDefines.add("AMD64");
+            sysDefines.add("_WIN64");
+            sysDefines.add("_LP64");
+            if (System.getenv("MSC_VER") != null)
+               sysDefines.add("MSC_VER=" + System.getenv("MSC_VER"));
             sysDefines.add("HOTSPOT_LIB_ARCH=\\\"amd64\\\"");
         }
+	
         sysDefines.add("_WINDOWS");
-        sysDefines.add("HOTSPOT_BUILD_USER="+System.getProperty("user.name"));
+        sysDefines.add("HOTSPOT_BUILD_USER=\\\""+System.getProperty("user.name")+"\\\"");
         sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\"");
         sysDefines.add("_JNI_IMPLEMENTATION_");
+        sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\"");
 
         sysDefines.addAll(defines);
 
@@ -333,6 +349,10 @@
         return get("Build");
     }
 
+    String outputDir() {
+        return get("OutputDir");
+    }
+
     Object getSpecificField(String field) {
         return getField(get("Id"), field);
     }
@@ -521,6 +541,9 @@
                 case 'f':
                     sb.append(flavour());
                     break;
+		case 'o':
+		    sb.append(outputDir());
+		    break;
                 default:
                     sb.append(ch);
                     sb.append(ch1);