aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-01-03 02:12:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-01-03 02:12:46 +0000
commitc3bc9db26d2be07197fdaefb60e2011ca58afb30 (patch)
tree8fb0735c3fdc3d4cf880384fc57ea65d3e983486 /include
parent89749888e923590a7c9a501633c2a68884f2115a (diff)
downloadupstream-c3bc9db26d2be07197fdaefb60e2011ca58afb30.tar.gz
upstream-c3bc9db26d2be07197fdaefb60e2011ca58afb30.tar.bz2
upstream-c3bc9db26d2be07197fdaefb60e2011ca58afb30.zip
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
Diffstat (limited to 'include')
-rw-r--r--include/package.mk4
1 files changed, 3 insertions, 1 deletions
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)