diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-13 18:41:20 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-13 18:41:20 +0200 |
| commit | 20c1d7d7ff68c8351fd8bb953371012168240279 (patch) | |
| tree | 319028ef824c3605b5e4c8839d9067c8c624553c /defs | |
| parent | f94310a380705f493142c8f130fc616c039e19fe (diff) | |
| parent | 171a31b10048968c70c963239e40b7a6d5c648de (diff) | |
| download | automake-20c1d7d7ff68c8351fd8bb953371012168240279.tar.gz | |
Merge branch 'master' into ng/master
* master:
build: use slightly older help2man, for improved portability
tests: avoid spurious failure when 'install-info' program is unavailable
install: shell parameter expansions can be used in directory names
test defs: more environment cleanups
test defs: unset 'AM_UPDATE_INFO_DIR' environment variable
build: generate doc/*.1 files; include help2man
build: avoid parallel build failures
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'defs')
| -rw-r--r-- | defs | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -150,6 +150,8 @@ unset htmldir includedir infodir libdir libexecdir localedir mandir unset oldincludedir pdfdir psdir sbindir sharedstatedir sysconfdir # Unset variables that might change the "make distcheck" behaviour. unset DISTCHECK_CONFIGURE_FLAGS AM_DISTCHECK_CONFIGURE_FLAGS +# Used by install rules for info files. +unset AM_UPDATE_INFO_DIR # The tests call "make -e" but we do not want $srcdir from the environment # to override the definition from the Makefile. unset srcdir @@ -166,7 +168,7 @@ unset TEST_LOGS unset TEST_SUITE_LOG unset RECHECK_LOGS unset VERBOSE -for pfx in TEST_ TAP_ ''; do +for pfx in TEST_ SH_ TAP_ ''; do unset ${pfx}LOG_COMPILER unset ${pfx}LOG_COMPILE # Not a typo! unset ${pfx}LOG_FLAGS |