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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/automake.texi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/automake.texi b/doc/automake.texi index 1f0b7e581..dbe222d20 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -3221,6 +3221,11 @@ overridden using the @env{AUTOM4TE} environment variable. Look for the automake-provided macro files in @var{dir} instead of in the installation directory. This is typically used for debugging. +@vindex ACLOCAL_AUTOMAKE_DIR +The environment variable @env{ACLOCAL_AUTOMAKE_DIR} provides another +way to set the directory containing automake-provided macro files. +However @option{--automake-acdir} takes precedence over it. + @item --system-acdir=@var{dir} @opindex --system-acdir Look for the system-wide third-party macro files (and the special |