From: Tom Tromey <tromey@redhat.com>
Date: Mon, 11 Jan 1999 14:07:33 +0000 (+0000)
Subject: 1999-01-11  Marcus G. Daniels  <mgd@chama.santafe.edu>
X-Git-Tag: Release-1-4~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f64cfd3bc0d7e8d9dfef43e9ad146f259747c165;p=thirdparty%2Fautomake.git

1999-01-11  Marcus G. Daniels  <mgd@chama.santafe.edu>
	* automake.in (PATH_PATTERN): New variable:
	(INCLUDE_PATTERN): Use it.  Ignore all include commands using
	symbols besides $(top_srcdir) and $(srcdir).
---

diff --git a/ChangeLog b/ChangeLog
index 8f17266d3..71bd7da12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-01-11  Marcus G. Daniels  <mgd@chama.santafe.edu>
+
+	* automake.in (PATH_PATTERN): New variable:
+	(INCLUDE_PATTERN): Use it.  Ignore all include commands using 
+	symbols besides $(top_srcdir) and $(srcdir).
+
 1999-01-11  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* automake.in (handle_dist_worker): avoid failure in `make dist'
diff --git a/automake.in b/automake.in
index c3edae8b4..bd5f4f842 100755
--- a/automake.in
+++ b/automake.in
@@ -47,8 +47,9 @@ $GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?";
 $IF_PATTERN = "^if[ \t]+\([A-Za-z][A-Za-z0-9_]*\)[ \t]*\(#.*\)?\$";
 $ELSE_PATTERN = "^else[ \t]*\(#.*\)?\$";
 $ENDIF_PATTERN = "^endif[ \t]*\(#.*\)?\$";
+$PATH_PATTERN='(\\w|/|\\.)+';
 # This will pass through anything not of the prescribed form.
-$INCLUDE_PATTERN = "^include[ \t]+((\\\$\\\(top_srcdir\\\)/[^ \t\n]+)|(\\\$\\\(srcdir\\\)/[^ \t\n]+)|([^/][^\\\ \t]+))[ \t]*(#.*)?\$";
+$INCLUDE_PATTERN = "^include[ \t]+((\\\$\\\(top_srcdir\\\)/${PATH_PATTERN})|(\\\$\\\(srcdir\\\)/${PATH_PATTERN})|([^/\\\$]${PATH_PATTERN}))[ \t]*(#.*)?\$";
 
 # Some regular expressions.  One reason to put them here is that it
 # makes indentation work better in Emacs.