X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=include%2Fpackage.mk;h=7f9437c334c412097a1cf6ea112342809c00ba8d;hp=c937ab30d61cb6a6ee8186da976d6b85164ab4d6;hb=64822aee66eff84090d555fc591c564e514419d9;hpb=55770592c7d14f747988c4e169796292d103c0fc diff --git a/include/package.mk b/include/package.mk index c937ab30d6..7f9437c334 100644 --- a/include/package.mk +++ b/include/package.mk @@ -31,6 +31,8 @@ include $(INCLUDE_DIR)/autotools.mk override MAKEFLAGS= export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) +CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST))) +SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE)) ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),) ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) @@ -81,7 +83,7 @@ define Build/DefaultTargets touch $$@ $(STAMP_INSTALLED): $(STAMP_BUILT) - $(NO_TRACE_MAKE) clean-staging + $(SUBMAKE) clean-staging rm -rf $(TMP_DIR)/stage-$(PKG_NAME) mkdir -p $(TMP_DIR)/stage-$(PKG_NAME)/host $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages $(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)