diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-18 20:28:20 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-18 20:28:20 +0200 |
| commit | 42eaadf9b117768814796728c8bef23009d9a52a (patch) | |
| tree | 7cff713d3e41beb3c9967d59031426761d73a906 /t/silent-nested-vars.sh | |
| parent | 5fe99e28ae324fe1fd211cf289c0f9f75977f07e (diff) | |
| parent | ca41efd3e14a9523e4e0cc1d9689eb30b6b7045a (diff) | |
| download | automake-42eaadf9b117768814796728c8bef23009d9a52a.tar.gz | |
Merge branch 'subdir-objects-work'
* subdir-objects-work:
depend: reduce code duplication, de-uglify make verbose output
depend: prefer $(...) over `...` in Cygwin-specific recipes
depend: reduce code duplication
depend: a preparatory refactoring
depend: refactor and remove code duplication
Automake::Language: drop unused fields 'compile_flag' and 'output_flag'
depend: assume '-c' compiler flag always means to produce object files
depend: assume we can always pass '-o' to the C compiler
cleanup: having subdir-objects mandatory allow us some simplifications
subdir-objects: enable unconditionally
Diffstat (limited to 't/silent-nested-vars.sh')
| -rw-r--r-- | t/silent-nested-vars.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh index f03204d0b..08f46fd26 100644 --- a/t/silent-nested-vars.sh +++ b/t/silent-nested-vars.sh @@ -67,7 +67,7 @@ case $1 in done ;; esac -nested_var_pat='^[^#].*\$([^)]*\$' +nested_var_pat='^[^#].*[^$]\$([^)]*\$' if case $makefile in -) printf '%s\n' "$makerules" | grep "$nested_var_pat";; |