X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fautotools.mk;h=7bd400ab36d052b39fcb76a66873c8673eb189a0;hp=63edd5bddd013d10cc33e9c2bc87a4991d5b6572;hb=3d71786154fbb3fcfbd652115f3e75db3f729941;hpb=336e277e8b46394d4b5a6747d3d5e93be383a923 diff --git a/include/autotools.mk b/include/autotools.mk index 63edd5bddd..7bd400ab36 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -75,7 +75,7 @@ define autoreconf_target $(strip $(call autoreconf, \ $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \ $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \ - $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS))) + $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR_HOSTPKG)/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS))) endef define patch_libtool_target @@ -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