From 3826b8c0c423718709202ce8efdd8cda207203ed Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Sun, 31 Jan 2010 18:21:41 +0000
Subject: [PATCH] Use only the base name of projects as program file name.

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

diff --git a/platform/apple2enh/Makefile.apple2enh b/platform/apple2enh/Makefile.apple2enh
index 43e54bb48..3a139e49b 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.10 2010/01/31 09:34:12 oliverschmidt Exp $
+# $Id: Makefile.apple2enh,v 1.11 2010/01/31 18:21:41 oliverschmidt Exp $
 #
 
 CONTIKI_SOURCEFILES += log-asm.S pfs.S
@@ -50,7 +50,7 @@ ifeq ($(MAKECMDGOALS),disk)
   endif
 endif
 
-TRIM_PROJECT := ${shell echo $(CONTIKI_PROJECT) | sed 's!\(.\{1,8\}\).*!\1!'}
+TRIM_PROJECT := ${shell echo $(CONTIKI_PROJECT) | sed 's!\([^-]\{1,8\}\).*!\1!'}
 
 disk: all
 	cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk contiki.dsk
diff --git a/platform/c128/Makefile.c128 b/platform/c128/Makefile.c128
index f1e600270..230a2231f 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.6 2010/01/31 09:34:13 oliverschmidt Exp $
+# $Id: Makefile.c128,v 1.7 2010/01/31 18:21:41 oliverschmidt Exp $
 #
 
 CONTIKI_CPU = $(CONTIKI)/cpu/6502
@@ -45,9 +45,11 @@ ifeq ($(MAKECMDGOALS),disk)
   endif
 endif
 
+TRIM_PROJECT := ${shell echo $(CONTIKI_PROJECT) | sed 's!\([^-]*\).*!\1!'}
+
 disk: all
 	$(C1541) -format contiki,00 d71 contiki.d71
-	$(C1541) -attach contiki.d71 -write $(CONTIKI_PROJECT).$(TARGET)          $(CONTIKI_PROJECT)
+	$(C1541) -attach contiki.d71 -write $(CONTIKI_PROJECT).$(TARGET)          $(TRIM_PROJECT)
 	$(C1541) -attach contiki.d71 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg
 	$(C1541) -attach contiki.d71 -write cs8900a.eth                           cs8900a.eth
 	$(C1541) -attach contiki.d71 -write lan91c96.eth                          lan91c96.eth
diff --git a/platform/c64/Makefile.c64 b/platform/c64/Makefile.c64
index 70ea5a0f7..1d8045fa0 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.8 2010/01/31 09:34:13 oliverschmidt Exp $
+# $Id: Makefile.c64,v 1.9 2010/01/31 18:21:41 oliverschmidt Exp $
 #
 
 CONTIKI_CPU = $(CONTIKI)/cpu/6502
@@ -45,9 +45,11 @@ ifeq ($(MAKECMDGOALS),disk)
   endif
 endif
 
+TRIM_PROJECT := ${shell echo $(CONTIKI_PROJECT) | sed 's!\([^-]*\).*!\1!'}
+
 disk: all
 	$(C1541) -format contiki,00 d64 contiki.d64
-	$(C1541) -attach contiki.d64 -write $(CONTIKI_PROJECT).$(TARGET)          $(CONTIKI_PROJECT)
+	$(C1541) -attach contiki.d64 -write $(CONTIKI_PROJECT).$(TARGET)          $(TRIM_PROJECT)
 	$(C1541) -attach contiki.d64 -write $(CONTIKI)/tools/$(TARGET)/sample.cfg contiki.cfg
 	$(C1541) -attach contiki.d64 -write cs8900a.eth                           cs8900a.eth
 	$(C1541) -attach contiki.d64 -write lan91c96.eth                          lan91c96.eth