From f74503c23c1b1fe5e1fcee91f212b8aade04b64c Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Mon, 26 May 2008 10:13:32 +0000
Subject: [PATCH] Replace non-fully-functional hack with the new gnumake
 variable CONTIKI_PROJECT.

---
 platform/apple2enh/Makefile.apple2enh | 6 +++---
 platform/c128/Makefile.c128           | 6 +++---
 platform/c64/Makefile.c64             | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform/apple2enh/Makefile.apple2enh b/platform/apple2enh/Makefile.apple2enh
index dacbc5d0f..c18cc4bb6 100644
--- a/platform/apple2enh/Makefile.apple2enh
+++ b/platform/apple2enh/Makefile.apple2enh
@@ -30,7 +30,7 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.apple2enh,v 1.5 2008/05/22 22:21:43 oliverschmidt Exp $
+# $Id: Makefile.apple2enh,v 1.6 2008/05/26 10:13:32 oliverschmidt Exp $
 #
 
 CONTIKI_SOURCEFILES += log-asm.S pfs.S
@@ -55,11 +55,11 @@ ifeq ($(MAKECMDGOALS),disk)
   endif
 endif
 
-DISK = ${basename ${wildcard *.$(TARGET)}}.dsk
+DISK = $(CONTIKI_PROJECT).dsk
 disk: all
 	cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk $(DISK)
 	java -jar $(AC) -p    $(DISK) contiki.system sys 0 < $(CONTIKI)/tools/$(TARGET)/loader-reboot.system
-	java -jar $(AC) -cc65 $(DISK) contiki        bin   < ${wildcard *.$(TARGET)}
+	java -jar $(AC) -cc65 $(DISK) contiki        bin   < $(CONTIKI_PROJECT).$(TARGET)
 	java -jar $(AC) -p    $(DISK) contiki.cfg    bin 0 < $(CONTIKI)/tools/$(TARGET)/sample.cfg
 	java -jar $(AC) -p    $(DISK) cs8900a.eth    rel 0 < cs8900a.eth
 	java -jar $(AC) -p    $(DISK) lan91c96.eth   rel 0 < lan91c96.eth
diff --git a/platform/c128/Makefile.c128 b/platform/c128/Makefile.c128
index 712a210ab..70320547f 100644
--- a/platform/c128/Makefile.c128
+++ b/platform/c128/Makefile.c128
@@ -30,7 +30,7 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.c128,v 1.2 2008/05/22 22:19:30 oliverschmidt Exp $
+# $Id: Makefile.c128,v 1.3 2008/05/26 10:14:03 oliverschmidt Exp $
 #
 
 CFLAGS += -DWITH_PETSCII
@@ -44,10 +44,10 @@ ifeq ($(MAKECMDGOALS),disk)
   endif
 endif
 
-DISK = ${basename ${wildcard *.$(TARGET)}}.d71
+DISK = $(CONTIKI_PROJECT).d71
 disk: all
 	$(C1541) -format contiki,00 d71 $(DISK)
-	$(C1541) -attach $(DISK) -write ${wildcard *.$(TARGET)}               contiki
+	$(C1541) -attach $(DISK) -write $(CONTIKI_PROJECT).$(TARGET)          contiki
 	$(C1541) -attach $(DISK) -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg
 	$(C1541) -attach $(DISK) -write cs8900a.eth                           cs8900a.eth
 	$(C1541) -attach $(DISK) -write lan91c96.eth                          lan91c96.eth
diff --git a/platform/c64/Makefile.c64 b/platform/c64/Makefile.c64
index da65e9fbf..da89f1dc4 100644
--- a/platform/c64/Makefile.c64
+++ b/platform/c64/Makefile.c64
@@ -30,7 +30,7 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.c64,v 1.4 2008/05/22 22:18:25 oliverschmidt Exp $
+# $Id: Makefile.c64,v 1.5 2008/05/26 10:14:28 oliverschmidt Exp $
 #
 
 CFLAGS += -DWITH_PETSCII
@@ -44,10 +44,10 @@ ifeq ($(MAKECMDGOALS),disk)
   endif
 endif
 
-DISK = ${basename ${wildcard *.$(TARGET)}}.d64
+DISK = $(CONTIKI_PROJECT).d64
 disk: all
 	$(C1541) -format contiki,00 d64 $(DISK)
-	$(C1541) -attach $(DISK) -write ${wildcard *.$(TARGET)}               contiki
+	$(C1541) -attach $(DISK) -write $(CONTIKI_PROJECT).$(TARGET)          contiki
 	$(C1541) -attach $(DISK) -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg
 	$(C1541) -attach $(DISK) -write cs8900a.eth                           cs8900a.eth
 	$(C1541) -attach $(DISK) -write lan91c96.eth                          lan91c96.eth