From 3348b5175fcf8a50b57d809019e1298312344581 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 11 Jan 1999 14:07:32 +0000 Subject: [PATCH] 1999-01-11 Marcus G. Daniels * automake.in (PATH_PATTERN): New variable: (INCLUDE_PATTERN): Use it. Ignore all include commands using symbols besides $(top_srcdir) and $(srcdir). --- ChangeLog | 6 ++++++ automake.in | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f17266d..71bd7da1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-01-11 Marcus G. Daniels + + * 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 * automake.in (handle_dist_worker): avoid failure in `make dist' diff --git a/automake.in b/automake.in index c3edae8b..bd5f4f84 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. -- 2.43.5