From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 14 Jan 2017 17:09:33 +0000 (+0100)
Subject: include/autotools.mk: use STAGING_DIR_HOSTPKG where appropriate
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=12d0a6694205b014f2c59e55fdb4b06b98c0b613;p=openwrt%2Fstaging%2Fblogic.git

include/autotools.mk: use STAGING_DIR_HOSTPKG where appropriate

Make sure binaries install to STAGING_DIR_HOSTPKG are still found when
this variable is eventually modified.

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

diff --git a/include/autotools.mk b/include/autotools.mk
index 63edd5bddd01..c6aa47e0bef3 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -85,11 +85,11 @@ endef
 
 define gettext_version_target
 	(cd $(PKG_BUILD_DIR) && \
-		GETTEXT_VERSION=$(shell $(STAGING_DIR)/host/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.*\([0-9]\.[0-9]\{2\}\.[0-9]\).*/\1/p' ) && \
+		GETTEXT_VERSION=$(shell $(STAGING_DIR_HOSTPKG)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.*\([0-9]\.[0-9]\{2\}\.[0-9]\).*/\1/p' ) && \
 		$(STAGING_DIR_HOST)/bin/sed \
 			-i $(PKG_BUILD_DIR)/configure.ac \
 			-e "s/AM_GNU_GETTEXT_VERSION(.*)/AM_GNU_GETTEXT_VERSION(\[$$$$GETTEXT_VERSION\])/g" && \
-		$(STAGING_DIR)/host/bin/autopoint --force \
+		$(STAGING_DIR_HOSTPKG)/bin/autopoint --force \
 	);
 endef