From 111379fb08ecbacc5120720652b3ce6ecbb528df Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 16 Apr 2005 07:14:45 +0000 Subject: add versioned aclocal directory to acpaths for autoreconf BKrev: 4260bb65qQlKjLMowOfitF_BjV8z_w --- classes/autotools.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 85d96e0028..7e81a68a9d 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -90,8 +90,11 @@ autotools_do_configure() { else acpaths="${acpaths}" fi + AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"` + automake --version + echo "AUTOV is $AUTOV" install -d ${STAGING_DIR}/${HOST_SYS}/share/aclocal - acpaths="$acpaths -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal" + acpaths="$acpaths -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal-$AUTOV -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal" # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look # like it was auto-generated. Work around this by blowing it away # by hand, unless the package specifically asked not to run aclocal. -- cgit 1.2.3-korg