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 /pre-inst-env.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 'pre-inst-env.in')
| -rw-r--r-- | pre-inst-env.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pre-inst-env.in b/pre-inst-env.in index 880012cce..f285ca62c 100644 --- a/pre-inst-env.in +++ b/pre-inst-env.in @@ -32,4 +32,10 @@ export AUTOMAKE_UNINSTALLED AUTOMAKE_LIBDIR="$abs_top_srcdir/lib" export AUTOMAKE_LIBDIR +ACLOCAL_AUTOMAKE_DIR="$abs_top_srcdir/m4" +export ACLOCAL_AUTOMAKE_DIR + +ACLOCAL_PATH="$abs_top_srcdir/m4/acdir" +export ACLOCAL_PATH + exec "$@" |