From f51c3470965abec43e132ab64becb5e952684b34 Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Mon, 23 Apr 2007 16:38:41 +0000
Subject: [PATCH] Fix for [Bug 182465] Creating new CDT project with make adds
 include directories

---
 .../CfgScannerConfigInfoFactory2.java         | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java
index 3a6fae63be7..1cc1e53e626 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java
@@ -135,10 +135,23 @@ public class CfgScannerConfigInfoFactory2 {
 	
 					if(info == null){
 						String id = cfg.getDiscoveryProfileId();
-						if(id != null)
-							info = container.createInfo(baseContext, id);
-						else
-							info = container.createInfo(baseContext);
+						IScannerConfigBuilderInfo2 prefInfo = null;
+						if(!cfg.isPreference()){
+							IConfiguration prefCfg = ManagedBuildManager.getPreferenceConfiguration(false);
+							ICfgScannerConfigBuilderInfo2Set prefContainer = create(prefCfg);
+							prefInfo = prefContainer.getInfo(new CfgInfoContext(prefCfg));
+						}
+						if(prefInfo == null){
+							if(id != null)
+								info = container.createInfo(baseContext, id);
+							else
+								info = container.createInfo(baseContext);
+						} else {
+							if(id != null)
+								info = container.createInfo(baseContext, prefInfo, id);
+							else
+								info = container.createInfo(baseContext, prefInfo, prefInfo.getSelectedProfileId());
+						}
 					}
 					map.put(new CfgInfoContext(cfg), info);				
 				} else {