lede-packages-rs

commit ee8227eccec0b417dbb126a76bdef7c8d20c41f7
parent 524e19171cbd0abc3bcc0087f4ef39fcf733e294
Author: Matthias Schiffer <mschiffer@universe-factory.net>
Date:   Tue, 18 Oct 2016 22:02:48 +0200

Merge pull request #3291 from NeoRaider/autotools

autotools: don't rely on STAGING_DIR_HOST
Diffstat:
M
devel/autoconf/Makefile
 | 
3
++-
M
devel/automake/Makefile
 | 
8
++++----
M
devel/libtool-bin/Makefile
 | 
3
++-

3 files changed, 8 insertions(+), 6 deletions(-)
diff --git 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 \
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
@@ -34,6 +34,8 @@ define Package/automake/description
   with the GNU Coding Standards.
 endef
 
+FIX_PATHS = $(SED) '1c \#!/usr/bin/perl' -e 's| /[^ ]*/bin/perl| /usr/bin/perl|g'
+
 define Package/automake/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/automake-$(PKG_VERSION) \
@@ -42,10 +44,8 @@ define Package/automake/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aclocal-$(PKG_VERSION) \
 	  $(1)/usr/bin/aclocal-$(PKG_VERSION)
 	$(LN) aclocal-$(PKG_VERSION) $(1)/usr/bin/aclocal
-	$(SED) 's|$(STAGING_DIR_HOST)|/usr|g' \
-	  $(1)/usr/bin/automake-$(PKG_VERSION)
-	$(SED) 's|$(STAGING_DIR_HOST)|/usr|g' \
-	  $(1)/usr/bin/aclocal-$(PKG_VERSION)
+	$(FIX_PATHS) $(1)/usr/bin/automake-$(PKG_VERSION)
+	$(FIX_PATHS) $(1)/usr/bin/aclocal-$(PKG_VERSION)
 	$(INSTALL_DIR) $(1)/usr/share/automake-$(PKG_VERSION)
 
 	for dir in \
diff --git a/devel/libtool-bin/Makefile b/devel/libtool-bin/Makefile
@@ -22,6 +22,8 @@ PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+CONFIGURE_VARS += GREP=grep SED=sed
+
 define Package/libtool-bin
   SECTION:=devel
   CATEGORY:=Development
@@ -39,7 +41,6 @@ endef
 define Package/libtool-bin/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(1)/usr/bin/
-	$(SED) 's|$(STAGING_DIR_HOST)||g' $(1)/usr/bin/libtoolize
 	$(INSTALL_DIR) $(1)/usr/share/aclocal/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4 \
 	  $(1)/usr/share/aclocal/