Fix the issue with tos-deluge not timing out properly.

[tinyos-2.x.git] / support / make / Makerules

diff --git a/support/make/Makerules b/support/make/Makerules
index 8164f96659922189bf6473929166c26ecc8c58b0..6850fb1376b36c179da878bc4452a0f29c4eab1b 100644 (file)
--- 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)))