aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2017-01-14 18:09:33 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2017-01-14 18:57:13 +0100
commit12d0a6694205b014f2c59e55fdb4b06b98c0b613 (patch)
tree8d27113653e023a4dacdd4bbf5776e2978be9582
parente7e91e62bb68d907b6d7f7d95c8e6c076fda985e (diff)
downloadupstream-12d0a6694205b014f2c59e55fdb4b06b98c0b613.tar.gz
upstream-12d0a6694205b014f2c59e55fdb4b06b98c0b613.tar.bz2
upstream-12d0a6694205b014f2c59e55fdb4b06b98c0b613.zip
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>
-rw-r--r--include/autotools.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index 63edd5bddd..c6aa47e0be 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