diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2017-08-29 21:15:14 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-08-31 00:33:59 +0200 |
| commit | ab2d33e635f85f8f215b7e8f14571ec6360d2243 (patch) | |
| tree | 737e084b831e67f10d68a207628fbe267b2f0a2d /t/ax/test-defs.in | |
| parent | dd0b8142683d35bdb7e04cc15ece43039ede2a41 (diff) | |
| download | automake-ab2d33e635f85f8f215b7e8f14571ec6360d2243.tar.gz | |
aclocal: Support ACLOCAL_AUTOMAKE_DIR environment variable
* bin/aclocal.in: Reset '@automake_includes' and '@system_includes' in
for build environment. Allow setting '@automake_includes' with
ACLOCAL_AUTOMAKE_DIR environment variable.
(parse_arguments): Ignore 'dirlist' when '@system_includes' is empty.
* doc/automake.texi (aclocal Options): Document ACLOCAL_AUTOMAKE_DIR.
* bin/wrap-aclocal.in: Remove extra command line options.
* pre-inst-env.in: Set ACLOCAL_AUTOMAKE_DIR and ACLOCAL_PATH
environment variables.
* t/ax/test-defs.in: Adapt.
* t/ansi2knr-no-more.sh (warn_rx): Likewise.
Diffstat (limited to 't/ax/test-defs.in')
| -rw-r--r-- | t/ax/test-defs.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in index b4a690fc6..8cace053b 100644 --- a/t/ax/test-defs.in +++ b/t/ax/test-defs.in @@ -55,13 +55,13 @@ case ${am_running_installcheck:=no} in ;; no) am_amdir=$am_top_srcdir/lib/am - am_automake_acdir=$am_top_srcdir/m4 + am_automake_acdir="" am_bindir=$am_top_builddir/bin am_datadir=$am_top_srcdir am_docdir=$am_top_srcdir/doc am_pkgvdatadir=$am_top_srcdir/lib am_scriptdir=$am_top_srcdir/lib - am_system_acdir=$am_top_srcdir/m4/acdir + am_system_acdir="" ;; *) echo "$me: variable 'am_running_installcheck' has invalid" |