From 719852784a76d86fe177bea3377066eee8c649ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 10 Jul 2012 22:25:44 +0200 Subject: [PATCH] automake-1.11.x: create symlinks for un-versioned directory names The latest Automake version installs the 'aclocal' and 'automake' directories with a '-1.11' version suffix. Our setup hook is not prepared to handle that, so we add those symlinks as a quick fix. A better solution would be to extend the setup hook for Automake to recognize those kind of version suffixes. --- pkgs/development/tools/misc/automake/builder.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index 7f9e9219de3..e54a2acca67 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -36,10 +36,12 @@ postInstall() { # global directory, while callers of `aclocal' do not need to pass # `-I' options explicitly. - for prog in $out/bin/aclocal*; do + for prog in $out/bin/aclocal*; do wrapAclocal "$prog" done + + ln -s aclocal-1.11 $out/share/aclocal + ln -s automake-1.11 $out/share/automake } - genericBuild