diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-01-03 02:12:46 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-01-03 02:12:46 +0000 |
| commit | d0a426b8b8df15f47af1c3f1a5dfd2d1538784dc (patch) | |
| tree | 8fb0735c3fdc3d4cf880384fc57ea65d3e983486 | |
| parent | 0a6107c8d9c0ca46e05c797abf572ec65c434a23 (diff) | |
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
| -rw-r--r-- | include/package.mk | 4 |
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) |