Author: miguel
Date: 2007-12-21 12:56:47 -0500 (Fri, 21 Dec 2007)
New Revision: 91779

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/ChangeLog
   
trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
Log:
If the file "custom-hooks.make" exists in the project directory, include it, so 
we can implement the hooks there

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/ChangeLog   
2007-12-21 17:41:03 UTC (rev 91778)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/ChangeLog   
2007-12-21 17:56:47 UTC (rev 91779)
@@ -1,3 +1,7 @@
+2007-12-21  Miguel de Icaza <[EMAIL PROTECTED]> 
+
+       
+
 2007-12-20  Ankit Jain  <[EMAIL PROTECTED]>
 
        * MakefileGeneratorTool.cs: Use GettextCatalog.GetString for

Modified: 
trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
===================================================================
--- 
trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
     2007-12-21 17:41:03 UTC (rev 91778)
+++ 
trunk/monodevelop/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
     2007-12-21 17:56:47 UTC (rev 91779)
@@ -214,10 +214,17 @@
 
                                        conf_vars.AppendFormat ("include 
$(top_srcdir)/Makefile.include\n");
                                        conf_vars.AppendFormat ("include 
$(top_srcdir)/config.make\n\n");
-                                       if (ctx.TargetCombine.BaseDirectory != 
project.BaseDirectory)
-                                               //Don't emit for top level 
project makefile(eg. pdn.make), as it would be
-                                               //included by top level 
solution makefile
-                                               conf_vars.AppendFormat 
("#include $(srcdir)/custom-hooks.make\n\n");
+
+                                       
+                                       // Don't emit for top level project 
makefile(eg. pdn.make), as it would be
+                                       // included by top level solution 
makefile
+                                       if (ctx.TargetCombine.BaseDirectory != 
project.BaseDirectory){
+                                               string customhooks = 
Path.Combine (project.BaseDirectory, "custom-hooks.make");
+                                               bool include = File.Exists 
(customhooks);
+                                       
+                                               Console.WriteLine ("------ {0} 
for {1}", include, customhooks); 
+                                               conf_vars.AppendFormat 
("{0}include $(srcdir)/custom-hooks.make\n\n", include ? "" : "#");
+                                       }
                                }
 
                                bool buildEnabled;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to