From b4cff1eac623a89c20f0507e027a3c291242d102 Mon Sep 17 00:00:00 2001
From: Sean Evoy <sevoy@ca.ibm.com>
Date: Wed, 9 Jun 2004 19:14:54 +0000
Subject: [PATCH] Fix for 66258 -- Cannot mix compilers anymore. Do not need to
 add the relative path to the name of the dependency file when using
 'patsubst'

---
 .../managedbuilder/makegen/gnu/GnuMakefileGenerator.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index a63245a4357..57ff172881c 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -290,7 +290,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
 	 * 		@echo 'Building file: $<'
 	 * 		@echo <tool> <flags> <output_flag><output_prefix>$@ $<
 	 * 		@<tool> <flags> <output_flag><output_prefix>$@ $< && \
-	 * 		echo -n '<relative_path>/' $(@:%.o=%.d) ' <relative_path>/' >> $(@:%.o=%.d) && \
+	 * 		echo -n $(@:%.o=%.d) ' <relative_path>/' >> $(@:%.o=%.d) && \
 	 * 		<tool> -P -MM -MG <flags> $< >> $(@:%.o=%.d)
 	 * 		@echo 'Finished building: $<'
 	 * 		@echo ' '
@@ -302,7 +302,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
 	 * 		@echo 'Building file: $<'
 	 * 		@echo g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $<
 	 * 		@ g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $< && \
-	 * 		echo -n 'source1/'$(@:%.o=%.d) ' source1/' >> $(@:%.o=%.d) && \
+	 * 		echo -n $(@:%.o=%.d) ' source1/' >> $(@:%.o=%.d) && \
 	 * 		g++ -P -MM -MG -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers $< >> $(@:%.o=%.d)
 	 * 		@echo 'Finished building: $<'
 	 * 		@echo ' '
@@ -350,7 +350,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
 			buffer.append(WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK);
 			// TODO get the dep rule out of the tool
 			String depRule =  "$(@:%." + outputExtension + "=%." + DEP_EXT + ")";
-			buffer.append(TAB + ECHO + WHITESPACE + "-n" + WHITESPACE + SINGLE_QUOTE + relativePath + SINGLE_QUOTE + depRule + WHITESPACE + SINGLE_QUOTE + relativePath + SINGLE_QUOTE + WHITESPACE + ">" + WHITESPACE + depRule + WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK); //$NON-NLS-1$ //$NON-NLS-2$
+			buffer.append(TAB + ECHO + WHITESPACE + "-n" + WHITESPACE + depRule + WHITESPACE + SINGLE_QUOTE + relativePath + SINGLE_QUOTE + WHITESPACE + ">" + WHITESPACE + depRule + WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK); //$NON-NLS-1$ //$NON-NLS-2$
 			buffer.append(TAB + cmd + WHITESPACE + "-MM -MG -P -w" + WHITESPACE + buildFlags + WHITESPACE + IN_MACRO + WHITESPACE + ">>" + WHITESPACE + depRule); //$NON-NLS-1$ //$NON-NLS-2$
 			
 		}