diff --git a/make/buildsystem-helpers.mk b/make/buildsystem-helpers.mk
index 813809ec..5307193d 100644
--- a/make/buildsystem-helpers.mk
+++ b/make/buildsystem-helpers.mk
@@ -19,7 +19,7 @@ endef
 
 # -----------------------------------------------------------------------------
 
-# clean up
+# clean-up
 define CLEANUP
 	$(Q)( \
 	if [ "$($(PKG)_DIR)" ]; then \
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index c9f51ee7..35d050f8 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -90,8 +90,20 @@ endef
 
 # -----------------------------------------------------------------------------
 
+HOST_CONFIGURE_ENVIRONMENT = \
+	CC="$(HOSTCC)" \
+	GCC="$(HOSTCC)" \
+	CPP="$(HOSTCPP)" \
+	CXX="$(HOSTCXX)" \
+	LD="$(HOSTLD)" \
+	AR="$(HOSTAR)" \
+	AS="$(HOSTAS)" \
+	NM="$(HOSTNM)" \
+	OBJCOPY="$(HOSTOBJCOPY)" \
+	RANLIB="$(HOSTRANLIB)"
+
 HOST_CONFIGURE_ENV = \
-	$(HOST_MAKE_OPTS) \
+	$(HOST_CONFIGURE_ENVIRONMENT) \
 	CFLAGS="$(HOST_CFLAGS)" \
 	CPPFLAGS="$(HOST_CPPFLAGS)" \
 	CXXFLAGS="$(HOST_CXXFLAGS)" \
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 5f56a8fd..cc45f804 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -43,18 +43,6 @@ endef
 
 HOST_MAKE_ENV =
 
-HOST_MAKE_OPTS = \
-	CC="$(HOSTCC)" \
-	GCC="$(HOSTCC)" \
-	CPP="$(HOSTCPP)" \
-	CXX="$(HOSTCXX)" \
-	LD="$(HOSTLD)" \
-	AR="$(HOSTAR)" \
-	AS="$(HOSTAS)" \
-	NM="$(HOSTNM)" \
-	OBJCOPY="$(HOSTOBJCOPY)" \
-	RANLIB="$(HOSTRANLIB)"
-
 define HOST_MAKE
 	@$(call MESSAGE,"Compiling")
 	$(foreach hook,$($(PKG)_PRE_COMPILE_HOOKS),$(call $(hook))$(sep))