From 06692e3c2454b18de73a78f247b26b6bef1bf984 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 3 Oct 2016 14:52:59 +0200 Subject: [PATCH] automake: don't rely on STAGING_DIR_HOST We're currently preparing a change in LEDE that will change the host staging dirs in a way that might break the sed commands used by the automake Makefile. Change the command in a way that doesn't depend on the path of the staging dir. While it would be nicer to modify the configure script to use the correct path in the first place, this doesn't work for the perl path, as perl is used in shebang lines and must thus be an absolute path. Some scripts are used both during build and on the target system, so fixing up the scripts in the install step seems like the best option. Signed-off-by: Matthias Schiffer --- devel/automake/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 88cdbd14d3..8357011c7b 100644 --- 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 \