From b3b9b1afbdfe2ad098783afebbe0914fd6be4aa0 Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Tue, 24 Apr 2007 13:43:03 +0000
Subject: [PATCH] small build mechanism fixes

---
 .../eclipse/cdt/managedbuilder/core/ManagedBuildManager.java  | 4 +++-
 .../cdt/managedbuilder/internal/core/CommonBuilder.java       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
index c0546eba001..82d78486035 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
@@ -3713,7 +3713,9 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
 				}
 			}
 		} else {
-			fullPath = cfg.getOwner().getProject().getFullPath().append(cfg.getName());
+			fullPath = cfg.getOwner().getProject().getFullPath();
+			if(builder.isManagedBuildOn())
+				fullPath = fullPath.append(cfg.getName());
 		}
 		
 		return fullPath;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
index df771f41338..cc756877788 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
@@ -851,7 +851,7 @@ public class CommonBuilder extends ACBuilder {
 
 		IBuilder builder = bInfo.getBuilder();
 		IConfiguration cfg = bInfo.getConfiguration();
-		boolean isParallel = builder.getParallelizationNum() != 0;
+		boolean isParallel = builder.isParallelBuildOn() && builder.getParallelizationNum() > 1;
 //		boolean buildIncrementaly = true;
 		boolean resumeOnErr = !builder.isStopOnError();