X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=support%2Fmake%2FMakerules;h=6850fb1376b36c179da878bc4452a0f29c4eab1b;hb=ff26b9053471d371c781de727ac994ee626063be;hp=8164f96659922189bf6473929166c26ecc8c58b0;hpb=1ba974b83d19fc41bf80acd52726f36f7f1df297;p=tinyos-2.x.git diff --git a/support/make/Makerules b/support/make/Makerules index 8164f966..6850fb13 100644 --- a/support/make/Makerules +++ b/support/make/Makerules @@ -49,7 +49,9 @@ TINYOS_MAKELOCAL ?= $(TINYOS_MAKE_PATH)/Makelocal TINYOS_MAKEDEFAULTS ?= $(TINYOS_MAKE_PATH)/Makedefaults # Allow users to specify additional directories to find TOSMake files. -TOSMAKE_PATH += $(TINYOS_MAKE_PATH) +TOSMAKE_TEMP_PATH := $(TOSMAKE_PATH) +TOSMAKE_PATH = $(TINYOS_MAKE_PATH) +TOSMAKE_PATH += $(TOSMAKE_TEMP_PATH) # Save makecmdgoals (a read only var) to goals so that we can modify it. GOALS += $(MAKECMDGOALS) @@ -133,6 +135,8 @@ endef -include $(TINYOS_MAKELOCAL) -include $(TINYOS_MAKEDEFAULTS) +PLATFORMDIR ?= $(TOSDIR)/platforms/$(PLATFORM) + # Mark TOSMAKE_PATH with a + so that they're not searched for by TOSMake_find. $(foreach incdir,$(addprefix +,$(TOSMAKE_PATH)),$(call TOSMake_include_dir,$(incdir)))