[Tinyos-commits] CVS: tinyos-1.x/tools/make tinysec.extra,1.1,1.2

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tools/make
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5563

Modified Files:
	tinysec.extra 
Log Message:
support 2x tools


Index: tinysec.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/tinysec.extra,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tinysec.extra	8 Jan 2004 03:45:55 -0000	1.1
--- tinysec.extra	7 Feb 2006 17:17:58 -0000	1.2
***************
*** 10,14 ****
  KEYNAME := '\w+'
  
! TINYSEC_KEY := $(shell mote-key -kf $(KEYFILE) -kn $(KEYNAME))
  ifeq ($(TINYSEC_KEY),)
  $(error tinysec key has not been properly set. It is needed for tinysec. \
--- 10,16 ----
  KEYNAME := '\w+'
  
! MOTE_KEY ?= $(shell if type tos-mote-key >/dev/null 2>/dev/null; then echo tos-mote-key; else echo mote-key; fi)
! 
! TINYSEC_KEY := $(shell $(MOTE_KEY) -kf $(KEYFILE) -kn $(KEYNAME))
  ifeq ($(TINYSEC_KEY),)
  $(error tinysec key has not been properly set. It is needed for tinysec. \