diff options
| author | Thomas Jahns <jahns@dkrz.de> | 2015-06-29 09:50:02 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-07-15 17:25:28 +0200 |
| commit | fd244f28f5637e13009f75b6962d03401b22149c (patch) | |
| tree | 4667dea2d2f6c7c74983fd682c4a065a08eda724 | |
| parent | 87becfb21a35d79f32cb1af083124c8e116b1c2a (diff) | |
| download | automake-fd244f28f5637e13009f75b6962d03401b22149c.tar.gz | |
aclocal: Avoid problematic string interpolation
This fixes bug#20903. Thanks to Eric Bavier for reporting this issue.
* bin/aclocal.in (automake_includes): Avoid problematic string
interpolation.
* NEWS: Update.
* THANKS: Thank Eric Bavier.
Signed-off-by: Mathieu Lirzin <mthl@gnu.org>
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | bin/aclocal.in | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -110,6 +110,9 @@ New in 1.16: This was the second part of automake bug#13928. + - Installed 'aclocal' m4 macros can now accept installation directories + containing '@' characters (automake bug#20903) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ New in 1.15.1: @@ -111,6 +111,7 @@ Elmar Hoffmann elho@elho.net Elrond Elrond@Wunder-Nett.org Enrico Scholz enrico.scholz@informatik.tu-chemnitz.de Erez Zadok ezk@cs.columbia.edu +Eric Bavier bavier@cray.com Eric Blake eblake@redhat.com Eric Dorland eric@debian.org Eric Magnien emagnien@club-internet.fr diff --git a/bin/aclocal.in b/bin/aclocal.in index a4535bc47..7350c8e38 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -69,7 +69,7 @@ $perl_threads = 0; # ACLOCAL_PATH environment variable, and reset with the '--system-acdir' # option. my @user_includes = (); -my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); +my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION); my @system_includes = ('@datadir@/aclocal'); # Whether we should copy M4 file in $user_includes[0]. |