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
commitf75b9f6815086fdc936fc481977f555b6500e159 (patch)
tree7ea2bba4c1e12c4883d4adae3977f1f612870b54 /include
parent457d9d3d1b7bfc2a0adbcb9926a7666d67324987 (diff)
downloadupstream-f75b9f6815086fdc936fc481977f555b6500e159.tar.gz
upstream-f75b9f6815086fdc936fc481977f555b6500e159.tar.bz2
upstream-f75b9f6815086fdc936fc481977f555b6500e159.zip
fix packages that use -f on other build system makefiles
SVN-Revision: 10088
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)