fix to allow added targets from the TOSMAKE_PATH to be able to use .extra files int...

diff --git a/support/make/Makerules b/support/make/Makerules
index 6c48f9a0522bdfc1c972d011912e5a3ffcb55a86..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)

diff --git a/support/make/safe.extra b/support/make/safe.extra
index 583186f55be6fb9d270a5a05177f2d7ffc6d7d2a..b29429f85c417af150dcd23b8ca495ef0155fa29 100644 (file)
--- a/support/make/safe.extra
+++ b/support/make/safe.extra
@@ -1,5 +1,5 @@
 #-*-Makefile-*-
 
 MAKE_DEPUTY_FLAG := 1
-export MAKE_DEPUTY_FLAG
+#export MAKE_DEPUTY_FLAG