bug#25299: '@' character in installation prefix breaks automake-1.15

[Brantley, Michael]

Configuring automake to install to a path containing a ‘@’ character breaks the compilation as shown in the attached typescripts. We found that we were able to work around the bug with the following patch:

 

diff --git a/bin/aclocal.in b/bin/aclocal.in

index 349f24a2..c8ab8b3e 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].

 

In considering alternative fixes we found that we could equally address the problem by replacing the double-quoted string with '@datadir@/address@hidden@', similar to the use of @APIVERSION@ on line 30, but elected to continue the use of $APIVERSION in the event that there was a specific reason for using the Perl variable in this instance.

 

Regards,

 

Michael Brantley

typescript.good.txt
Description: typescript.good.txt

typescript.bad.txt
Description: typescript.bad.txt