[oe-commits] Chris Larson : autotools: shift default acpaths into oe_autoreconf

[git version control]

Module: openembedded.git
Branch: kergoth/autotools
Commit: 2370bf0efa70d3f291ff694eeb0463fe5eb95bd7
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2370bf0efa70d3f291ff694eeb0463fe5eb95bd7

Author: Chris Larson <chris_larson at mentor.com>
Date:   Wed Oct 20 13:19:31 2010 -0700

autotools: shift default acpaths into oe_autoreconf

Signed-off-by: Chris Larson <chris_larson at mentor.com>

---

 classes/autotools.bbclass |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index cdc1432..85bb672 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -66,7 +66,11 @@ _autoconf_trace () {
 }
 
 oe_autoreconf () {
-	aclocal "$@"
+	AUTOV=`automake --version | head -n 1 | sed "s/.* //;s/\.[0-9]\+$//"`
+	mkdir -p ${STAGING_DATADIR}/aclocal \
+	         ${STAGING_DATADIR}/aclocal-$AUTOV
+	aclocal "$@" -I${STAGING_DATADIR}/aclocal \
+	             -I${STAGING_DATADIR}/aclocal-$AUTOV
 	for subdir in $(_autoconf_trace AC_CONFIG_SUBDIRS | cut -d: -f4); do
 		pushd $subdir
 		oe_autoreconf "$@"
@@ -74,7 +78,7 @@ oe_autoreconf () {
 	done
 
 	rm -f configure
-	autoreconf --install --symlink --force --no-recursive ${EXTRA_AUTORECONF} "$@"
+	autoreconf --install --symlink --force --no-recursive ${EXTRA_AUTORECONF} "$@" $acpaths
 	if [ -n "`_autoconf_trace AM_GLIB_GNU_GETTEXT`" ]; then
 		if [ -e configure.in ]; then
 			CONFIGURE_AC=$srcdir/configure.in
@@ -115,10 +119,6 @@ autotools_do_configure() {
 			else
 				acpaths="${acpaths}"
 			fi
-			AUTOV=`automake --version | head -n 1 | sed "s/.* //;s/\.[0-9]\+$//"`
-			install -d ${STAGING_DATADIR}/aclocal
-			install -d ${STAGING_DATADIR}/aclocal-$AUTOV
-			acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV -I ${STAGING_DATADIR}/aclocal"
 			pushd ${S}
 			oe_autoreconf $acpaths
 			popd