From: regehr <regehr>
Date: Tue, 24 Jun 2008 15:39:13 +0000 (+0000)
Subject: tell Deputy to put the flid files into a convenient location
X-Git-Tag: release_tinyos_2_1_0_0~180
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=5bfa845fa9fa78c64fe34a23c6d2f19667f8f639

tell Deputy to put the flid files into a convenient location
---

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index cce05362..03b089ff 100644
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -24,7 +24,7 @@ endef
 HELP += $(AVR_HELP)
 
 ifdef MAKE_DEPUTY_FLAG
-        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/avr/fail.c 
+        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs=build/$(PLATFORM)/flids.txt --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/avr/fail.c 
 else
         NCC_SAFE_TINYOS_FLAGS =
 endif
diff --git a/support/make/msp/msp.rules b/support/make/msp/msp.rules
index 316c2e18..04b09077 100644
--- a/support/make/msp/msp.rules
+++ b/support/make/msp/msp.rules
@@ -23,7 +23,7 @@ endef
 HELP += $(MSP_HELP)
 
 ifdef MAKE_DEPUTY_FLAG
-        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/msp430/fail.c 
+        NCC_SAFE_TINYOS_FLAGS = -DSAFE_TINYOS -fnesc-deputy -fnesc-deputy-args='-I$(TOSDIR)/lib/safe/include --FLIDs=build/$(PLATFORM)/flids.txt --envmachine -DSAFE_TINYOS --nolib ' $(TOSDIR)/lib/safe/msp430/fail.c 
 else
         NCC_SAFE_TINYOS_FLAGS =
 endif