diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-04-27 16:09:43 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-04-29 16:16:39 +0200 |
commit | e432b0d3f7deffd3468e7b32ab6760bc7f3148f2 (patch) | |
tree | 0bbe22ceb134e2354d47e786949cd9eb6bcee552 /t/nodep.sh | |
parent | c97218a54271bdcc59a0a7b67704feb5344b89d9 (diff) | |
download | automake-e432b0d3f7deffd3468e7b32ab6760bc7f3148f2.tar.gz |
header-vars: simplify how make flags are determined
Actually, son far only the '-n' option ("dry mode") was detected,
but this change will allow us to soon detect more options.
* lib/am/header-vars.am (am__running_with_option): Even when $MAKEFLAGS
appears to contain definition of variables with embedded whitespace,
use simple textual pre-processing over $MAKEFLAGS rather than tricky
recursive invocations of make to determine whether the '-n' option was
given. This is enough to correctly handle all the tricky usages covered
in the testsuite.
* t/nodep.sh: Adjust to avoid a spurious failure.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/nodep.sh')
-rwxr-xr-x | t/nodep.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/nodep.sh b/t/nodep.sh index c36405d8f..b0b29f645 100755 --- a/t/nodep.sh +++ b/t/nodep.sh @@ -36,5 +36,7 @@ mkdir x $ACLOCAL $AUTOMAKE -grep '%' Makefile.in && exit 1 -exit 0 +sed 's/printf .*%s//' Makefile.in > Makefile.tmp +grep '%' Makefile.tmp && exit 1 + +: |