summaryrefslogtreecommitdiff
path: root/devel/monodevelop/patches/patch-ac
blob: bab62460f9190dae67cfd49afe0b4c2c6ff51728 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
$NetBSD: patch-ac,v 1.3 2010/10/16 04:40:37 kefren Exp $
--- src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs.orig	2010-06-14 22:48:25.000000000 +0300
+++ src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs	2010-10-15 18:07:01.000000000 +0300
@@ -170,7 +170,7 @@ namespace MonoDevelop.Autotools
 				chainedOutput.ChainWriter (monitor.Log);
 				chainedOutput.ChainWriter (swOutput);
 
-				ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
+				ProcessWrapper process = Runtime.ProcessService.StartProcess ("MAKEPROGRAM",
 						args,
 						baseDir, 
 						chainedOutput, 
@@ -258,7 +258,7 @@ namespace MonoDevelop.Autotools
 		// Snatched from our codedom code :-).
 		//FIXME: Get this from the language binding.. if a known lang
 
-		static Regex regexEnterDir = new Regex (@"make\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'");
+		static Regex regexEnterDir = new Regex (@"MAKEPROGRAM\[[0-9]*\]: ([a-zA-Z]*) directory `(.*)'");
 		
 		private static CompilerError CreateCompilerErrorFromString (string error_string, Stack<string> dirs, Regex regex)
 		{
@@ -284,7 +284,7 @@ namespace MonoDevelop.Autotools
 				return null;
 			}
 
-			if (error_string.StartsWith ("make"))
+			if (error_string.StartsWith ("MAKEPROGRAM"))
 				return null;
 
 			match = regex.Match (error_string);
@@ -349,7 +349,7 @@ namespace MonoDevelop.Autotools
 			{
 				string baseDir = proj.BaseDirectory;
 	
-				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", 
+				ProcessWrapper process = Runtime.ProcessService.StartProcess ( "MAKEPROGRAM", 
 						data.CleanTargetName,
 						baseDir, 
 						monitor.Log, 
@@ -404,7 +404,7 @@ namespace MonoDevelop.Autotools
 			monitor.BeginTask (GettextCatalog.GetString ("Executing {0}", project.Name), 1);
 			try
 			{
-				ProcessWrapper process = Runtime.ProcessService.StartProcess ("make",
+				ProcessWrapper process = Runtime.ProcessService.StartProcess ("MAKEPROGRAM",
 						data.ExecuteTargetName,
 						project.BaseDirectory,
 						console.Out,