From eb63cb21e024fbc3e05bc7682c64374ae24eb925 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Thu, 27 May 2010 12:42:48 +0000
Subject: [PATCH] Added make variable with command name to show in warning

---
 platform/jcreate/Makefile.jcreate |  4 ++--
 platform/sky/Makefile.common      | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/platform/jcreate/Makefile.jcreate b/platform/jcreate/Makefile.jcreate
index f809e8537..4089e4b01 100644
--- a/platform/jcreate/Makefile.jcreate
+++ b/platform/jcreate/Makefile.jcreate
@@ -1,4 +1,4 @@
-# $Id: Makefile.jcreate,v 1.1 2010/05/03 21:57:35 nifi Exp $
+# $Id: Makefile.jcreate,v 1.2 2010/05/27 12:42:49 nifi Exp $
 
 # Some drivers such as ds2411.c only compile under platform sky
 CFLAGS += -DCONTIKI_TARGET_SKY
@@ -10,7 +10,7 @@ CONTIKI_TARGET_SOURCEFILES += contiki-jcreate-platform.c \
 include $(CONTIKI)/platform/sky/Makefile.common
 
 ifneq ($(TMOTE_BSL), 1)
-  ${warning No tmote-bsl command found. Please install this command in contiki-2.x/tools/sky}
+  ${warning No $(TMOTE_BSL_FILE) command for jcreate found. Please install this command in $(CONTIKI)/tools/sky}
 endif
 
 CONTIKI_TARGET_DIRS += ${addprefix ../sky/,. dev apps}
diff --git a/platform/sky/Makefile.common b/platform/sky/Makefile.common
index 14131e584..bd7c0db8d 100644
--- a/platform/sky/Makefile.common
+++ b/platform/sky/Makefile.common
@@ -1,4 +1,4 @@
-# $Id: Makefile.common,v 1.1 2010/05/03 13:51:11 nifi Exp $
+# $Id: Makefile.common,v 1.2 2010/05/27 12:42:48 nifi Exp $
 
 ARCH=spi.c ds2411.c xmem.c i2c.c node-id.c sensors.c cfs-coffee.c \
      cc2420.c cc2420-aes.c cc2420-arch.c cc2420-arch-sfd.c \
@@ -32,10 +32,11 @@ ifdef OS
     USBDEVPREFIX=/dev/com
     SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-windows
     MOTELIST = $(CONTIKI)/tools/sky/motelist-windows
-    TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/tmote-bsl.exe),1,0)
+    TMOTE_BSL_FILE = tmote-bsl
+    TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE).exe),1,0)
     ifeq ($(TMOTE_BSL), 1)
       NUMPAR = 1
-      BSL =  $(CONTIKI)/tools/sky/tmote-bsl
+      BSL =  $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)
       MOTES = $(shell $(MOTELIST) | grep COM | \
          cut -f 4 -d \  )
     else
@@ -56,10 +57,11 @@ ifndef MOTELIST
   USBDEVPREFIX=
   SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-linux
   MOTELIST = $(CONTIKI)/tools/sky/motelist-linux
-  TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/tmote-bsl-linux),1,0)
+  TMOTE_BSL_FILE = tmote-bsl-linux
+  TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)),1,0)
   ifeq ($(TMOTE_BSL), 1)
     PATH := $(PATH):$(CONTIKI)/tools/sky
-    BSL =  $(CONTIKI)/tools/sky/tmote-bsl-linux
+    BSL =  $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)
     NUMPAR = 1
   else
     BSL = $(CONTIKI)/tools/sky/msp430-bsl-linux --telosb