diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-04-30 15:35:46 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-04-30 15:35:46 +0200 |
| commit | 96b1303de222614b325b6744e61addf15d4f80cf (patch) | |
| tree | 69ae150d15d7585b83e76ff546f0ad0f9140696f /maintainer | |
| parent | f0d1288f3a2033577ee4e374d203bcb5d8477a9d (diff) | |
| parent | 2a40fa7174961a0eb0ca08280ab638ed1998ead4 (diff) | |
| download | automake-96b1303de222614b325b6744e61addf15d4f80cf.tar.gz | |
Merge branch 'branch-1.13.2' into maint
* branch-1.13.2:
sync: update files from upstream with "make fetch"
maintcheck: remove outdated whitelisting
tar: format 'ustar' cannot support UID/GID longer than 21 bits
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'maintainer')
| -rw-r--r-- | maintainer/syntax-checks.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk index 878789f15..ab316cb15 100644 --- a/maintainer/syntax-checks.mk +++ b/maintainer/syntax-checks.mk @@ -375,13 +375,7 @@ sc_tests_overriding_macros_on_cmdline: # The first s/// tries to account for usages like "$MAKE || st=$?". # 'DISTCHECK_CONFIGURE_FLAGS' and 'exp' are allowed to contain whitespace in # their definitions, hence the more complex last three substitutions below. -# Also, the 'make-dryrun.sh' is whitelisted, since there we need to -# override variables from the command line in order to cover the expected -# code paths. - @tests=`for t in $(xtests); do \ - case $$t in */make-dryrun.sh);; *) echo $$t;; esac; \ - done`; \ - if sed -e 's/ || .*//' -e 's/ && .*//' \ + @if sed -e 's/ || .*//' -e 's/ && .*//' \ -e 's/ DESTDIR=[^ ]*/ /' -e 's/ SHELL=[^ ]*/ /' \ -e 's/ V=[^ ]*/ /' -e 's/ DISABLE_HARD_ERRORS=[^ ]*/ /' \ -e "s/ DISTCHECK_CONFIGURE_FLAGS='[^']*'/ /" \ @@ -390,7 +384,7 @@ sc_tests_overriding_macros_on_cmdline: -e "s/ exp='[^']*'/ /" \ -e 's/ exp="[^"]*"/ /' \ -e 's/ exp=[^ ]/ /' \ - $$tests | grep '\$$MAKE .*='; then \ + $(xtests) | grep '\$$MAKE .*='; then \ echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above lines,' 1>&2; \ echo 'it is more portable.' 1>&2; \ exit 1; \ |