From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 3 Jan 2008 02:12:46 +0000 (+0000)
Subject: fix packages that use -f on other build system makefiles
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/d0a426b8b8df15f47af1c3f1a5dfd2d1538784dc

fix packages that use -f on other build system makefiles


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10088 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/package.mk b/include/package.mk
index c937ab30d..7f9437c33 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)