From 373ace7ff48fb2647a79718c2fe147b716c9bd85 Mon Sep 17 00:00:00 2001
From: Alain Magloire
Date: Tue, 7 Sep 2004 19:29:14 +0000
Subject: set the location for the builtin files correctly

---
 .../org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java | 5 +++++
 .../eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
index 56dd377af28..f36308f688a 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java
@@ -16,6 +16,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Stack;
@@ -48,6 +49,7 @@ import org.eclipse.cdt.make.internal.core.makefile.TargetRule;
 import org.eclipse.cdt.make.internal.core.makefile.Util;
 import org.eclipse.cdt.make.internal.core.makefile.posix.PosixMakefileUtil;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 
 /**
  * Makefile : ( statement ) *
@@ -772,6 +774,9 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 			try {
 				InputStream stream = MakeCorePlugin.getDefault().openStream(new Path(location));
 				GNUMakefile gnu = new GNUMakefile();
+				URL url = Platform.find(MakeCorePlugin.getDefault().getBundle(), new Path(location));
+				url = Platform.resolve(url);
+				location = url.getFile();
 				gnu.parse(location, new InputStreamReader(stream));
 				builtins = gnu.getDirectives();
 				for (int i = 0; i < builtins.length; i++) {
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java
index 3e8a5b7fcb1..2ff9665807f 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java
@@ -16,6 +16,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.URL;
 
 import org.eclipse.cdt.make.core.MakeCorePlugin;
 import org.eclipse.cdt.make.core.makefile.IDirective;
@@ -42,6 +43,7 @@ import org.eclipse.cdt.make.internal.core.makefile.Target;
 import org.eclipse.cdt.make.internal.core.makefile.TargetRule;
 import org.eclipse.cdt.make.internal.core.makefile.Util;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 
 /**
  * Makefile : ( statement ) *
@@ -210,6 +212,9 @@ public class PosixMakefile extends AbstractMakefile {
 			try {
 				InputStream stream = MakeCorePlugin.getDefault().openStream(new Path(location));
 				PosixMakefile gnu = new PosixMakefile();
+				URL url = Platform.find(MakeCorePlugin.getDefault().getBundle(), new Path(location));
+				url = Platform.resolve(url);
+				location = url.getFile();
 				gnu.parse(location, new InputStreamReader(stream));
 				builtins = gnu.getDirectives();
 				for (int i = 0; i < builtins.length; i++) {
-- 
cgit v1.2.3