From ff26b9053471d371c781de727ac994ee626063be Mon Sep 17 00:00:00 2001 From: klueska Date: Fri, 26 Sep 2008 20:13:58 +0000 Subject: [PATCH] fix to allow added targets from the TOSMAKE_PATH to be able to use .extra files int he default path. Fix is to simple push the added paths at the end instead of at the beginning. --- support/make/Makerules | 4 +++- support/make/safe.extra | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/support/make/Makerules b/support/make/Makerules index 6c48f9a0..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) diff --git a/support/make/safe.extra b/support/make/safe.extra index 583186f5..b29429f8 100644 --- 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 -- 2.39.2