X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fflorian.git;a=blobdiff_plain;f=include%2Fpackage.mk;h=c134f542ed14365ce0f5cd82c13f8874380d313b;hp=80836326841a5a581835045b907ecc1bca5e3c43;hb=510bdd3f0ee6b843120d68c68dfd648ec498a357;hpb=b6f0cb53669e8b96fd15e6913faf1697f602a6b8 diff --git a/include/package.mk b/include/package.mk index 8083632684..c134f542ed 100644 --- a/include/package.mk +++ b/include/package.mk @@ -36,7 +36,6 @@ CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) ifneq ($(CONFIG_LINUX_2_4),) CONFIG_SITE:=$(subst linux-,linux2.4-,$(CONFIG_SITE)) endif -export CONFIG_SITE CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST))) SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE)) @@ -79,13 +78,15 @@ define Build/DefaultTargets touch $$@ $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) - $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(HOST_STAMP_INSTALLED) + $(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE) + $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep)) $(Build/Configure) $(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep)) touch $$@ $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG) + $(STAMP_BUILT) : export CONFIG_SITE:=$$(CONFIG_SITE) $(STAMP_BUILT): $(STAMP_CONFIGURED) $(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep)) $(Build/Compile) @@ -155,7 +156,7 @@ endif ), $(BuildTarget/$(target)) \ ) \ ) - $(if $(DUMP),,$(call Build/DefaultTargets,$(1))) + $(if $(PKG_HOST_ONLY)$(DUMP),,$(call Build/DefaultTargets,$(1))) endef define pkg_install_files