summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--THANKS1
-rw-r--r--bin/aclocal.in2
3 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5ddf6a06e..602b1a258 100644
--- a/NEWS
+++ b/NEWS
@@ -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:
diff --git a/THANKS b/THANKS
index 04ddb1357..fccce277b 100644
--- a/THANKS
+++ b/THANKS
@@ -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].