From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 3 Oct 2016 12:11:50 +0000 (+0200)
Subject: autoconf: don't rely on STAGING_DIR_HOST
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9e170ba2c0ef4cb6509420577f184985e2c2bd60;p=feed%2Fpackages.git

autoconf: don't rely on STAGING_DIR_HOST

We can just set M4 in the configure command instead of fixing up the paths
using sed afterwards. This makes the build more robust (and we're currently
preparing a change of the host staging dirs in LEDE that might break this
otherwise).

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 33e7056130..f50a84da17 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -21,6 +21,8 @@ PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+CONFIGURE_VARS += M4=m4
+
 define Package/autoconf
   SECTION:=devel
   CATEGORY:=Development
@@ -42,7 +44,6 @@ endef
 
 define Package/autoconf/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(SED) 's|$(STAGING_DIR_HOST)|/usr|g' $(PKG_INSTALL_DIR)/usr/bin/autom4te
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/share/autoconf
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/autoconf/INSTALL \