aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-12-15 00:19:08 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-12-15 00:19:08 +0000
commitf3ac8849a50707643ff9b9a128165ee02cb91c5e (patch)
tree13ddad77206a839f07bf233d34df1b39b84d68ac
parent6c1ace2f284920e12bf11900bfb666a9eedecc1b (diff)
downloadupstream-f3ac8849a50707643ff9b9a128165ee02cb91c5e.tar.gz
upstream-f3ac8849a50707643ff9b9a128165ee02cb91c5e.tar.bz2
upstream-f3ac8849a50707643ff9b9a128165ee02cb91c5e.zip
autotools.mk: explicately pass toolchain versions of automake, autoconf, libtoolize, ... to autoreconf
SVN-Revision: 24570
-rw-r--r--include/autotools.mk14
1 files changed, 12 insertions, 2 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index 2ab42df61f..308b45a5f3 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -13,6 +13,16 @@ define libtool_remove_files
find $(1) -name '*.la' | $(XARGS) rm -f;
endef
+
+AM_TOOL_PATHS:= \
+ AUTOM4TE=$(STAGING_DIR_HOST)/bin/autom4te \
+ AUTOCONF=$(STAGING_DIR_HOST)/bin/autoconf \
+ AUTOMAKE=$(STAGING_DIR_HOST)/bin/automake \
+ ACLOCAL=$(STAGING_DIR_HOST)/bin/aclocal \
+ AUTOHEADER=$(STAGING_DIR_HOST)/bin/autoheader \
+ LIBTOOLIZE=$(STAGING_DIR_HOST)/bin/libtoolize \
+ M4=$(STAGING_DIR_HOST)/bin/m4
+
# 1: build dir
# 2: remove files
# 3: automake paths
@@ -23,11 +33,11 @@ define autoreconf
$(patsubst %,rm -f %;,$(2)) \
$(foreach p,$(3), \
if [ -x $(p)/autogen.sh ]; then \
- $(p)/autogen.sh || true; \
+ $(AM_TOOL_PATHS) $(p)/autogen.sh || true; \
elif [ -f $(p)/configure.ac ] || [ -f $(p)/configure.in ]; then \
[ -f $(p)/aclocal.m4 ] && [ ! -f $(p)/acinclude.m4 ] && mv aclocal.m4 acinclude.m4; \
[ -d $(p)/autom4te.cache ] && rm -rf autom4te.cache; \
- $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
+ $(AM_TOOL_PATHS) $(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
-B $(STAGING_DIR_HOST)/share/aclocal \
$(patsubst %,-B %,$(5)) \
$(patsubst %,-I %,$(4)) $(4) || true; \