ChangeLogTag: Thu Dec 22 13:56:14 2005 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 18 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 293a6ab7..6e5a4802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Dec 22 13:56:14 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* modules/AutomakeProjectCreator.pm:
+
+	  Disable code that prefixed include paths with "$(srcdir)/".  In
+	  some cases an include path should be relative to the source dir,
+	  in others it should be relative to the build dir, and sometimes
+	  it should be relative to both.  Since it is impossible to guess
+	  which is the correct choice, require the *.mpc file to specify
+	  it correctly.
+
 Thu Dec 22 15:17:30 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * templates/vc7csharp.mpd:
diff --git a/modules/AutomakeProjectCreator.pm b/modules/AutomakeProjectCreator.pm
index 29b589f8..99bde870 100644
--- a/modules/AutomakeProjectCreator.pm
+++ b/modules/AutomakeProjectCreator.pm
@@ -37,11 +37,13 @@ sub fill_value {
     my($incs) = $self->get_assignment('includes');
     if (defined $incs) {
       my(@vec) = split(' ', $incs);
-      foreach(@vec) {
-        if (/^[^\$\/]/) {
-          $_ = '$(srcdir)/' . $_;
-        }
-      }
+
+#      # The following prefixes include paths with $(srcdir)/.
+#      foreach(@vec) {
+#        if (/^[^\$\/]/) {
+#          $_ = '$(srcdir)/' . $_;
+#        }
+#      }
 
       $value = \@vec;
     }