From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 13 Jan 2015 07:49:01 +0000 (+0000)
Subject: tools: bootstrap automake to pickup the correct in-tree autoconf
X-Git-Tag: reboot~4715
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=73a1f3597b0d4ba34306e8ce5f20957f1a1de7f1;p=openwrt%2Fstaging%2Flynxis.git

tools: bootstrap automake to pickup the correct in-tree autoconf

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43958
---

diff --git a/tools/automake/Makefile b/tools/automake/Makefile
index 300bee21ea..8c390d48de 100644
--- a/tools/automake/Makefile
+++ b/tools/automake/Makefile
@@ -18,6 +18,11 @@ include $(INCLUDE_DIR)/host-build.mk
 HOST_CONFIGURE_ARGS += --datarootdir=$(STAGING_DIR_HOST)/share
 HOST_CONFIGURE_VARS += am_cv_prog_PERL_ithreads=no
 
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); $(AM_TOOL_PATHS) STAGING_DIR="" ./bootstrap.sh)
+	$(call Host/Configure/Default)
+endef
+
 define Host/Install
 	# remove old automake resources to avoid version conflicts
 	rm -rf $(STAGING_DIR_HOST)/share/aclocal-[0-9]*