# HG changeset patch
# User boisy
# Date 1145820996 0
# Node ID abea68d642256c00536b80a4a7d0136fd1c24ff6
# Parent  a45c8cabc60e36f339c973a8532f76235be38b08
Fixed some issues

diff -r a45c8cabc60e -r abea68d64225 level1/makefile
--- a/level1/makefile	Sun Apr 23 19:24:03 2006 +0000
+++ b/level1/makefile	Sun Apr 23 19:36:36 2006 +0000
@@ -22,7 +22,3 @@
 # Clean DSK images
 dskclean:
 	$(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
-
-# Copy DSK images
-dskcopy: dsk
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
diff -r a45c8cabc60e -r abea68d64225 level2/makefile
--- a/level2/makefile	Sun Apr 23 19:24:03 2006 +0000
+++ b/level2/makefile	Sun Apr 23 19:36:36 2006 +0000
@@ -22,7 +22,3 @@
 # Clean DSK images
 dskclean:
 	$(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
-
-# Copy DSK images
-dskcopy: dsk
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
diff -r a45c8cabc60e -r abea68d64225 level2/sys/makefile
--- a/level2/sys/makefile	Sun Apr 23 19:24:03 2006 +0000
+++ b/level2/sys/makefile	Sun Apr 23 19:36:36 2006 +0000
@@ -1,7 +1,7 @@
 PORT = coco3
 include ../../rules.mak
 
-vpath %.hp $(6809L1)/sys
+vpath %.hp $(LEVEL1)/sys
 
 DEPENDS		= ./makefile
 
@@ -44,8 +44,8 @@
 $(HELPMSG): $(HELPFILES)
 	$(MERGE) $^ > $@
 
-$(L1TXTFILES): $(6809L1)/sys/$@
-	-$(SOFTLINK) $(6809L1)/sys/$@
+$(L1TXTFILES): $(LEVEL1)/sys/$@
+	-$(SOFTLINK) $(LEVEL1)/sys/$@
 
 clean:
 	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES)
diff -r a45c8cabc60e -r abea68d64225 makefile
--- a/makefile	Sun Apr 23 19:24:03 2006 +0000
+++ b/makefile	Sun Apr 23 19:36:36 2006 +0000
@@ -1,6 +1,6 @@
 include rules.mak
 
-dirs	= $(6809L1) $(6809L2) $(6309L2) $(3RDPARTY)
+dirs	= $(LEVEL1) $(LEVEL1) $(3RDPARTY)
  
 # Make all components
 all:
@@ -22,8 +22,3 @@
 # Clean DSK images
 dskclean:
 	$(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
-	-rm -f $(DSKDIR)/*
-
-# Copy DSK images
-dskcopy: dsk
-	$(foreach dir, $(dirs), ($(CD) $(dir); make dskcopy);)
diff -r a45c8cabc60e -r abea68d64225 rules.mak
--- a/rules.mak	Sun Apr 23 19:24:03 2006 +0000
+++ b/rules.mak	Sun Apr 23 19:36:36 2006 +0000
@@ -88,6 +88,8 @@
 
 # Directories
 3RDPARTY	= $(NITROS9DIR)/3rdparty
+LEVEL1		= $(NITROS9DIR)/level1
+LEVEL2		= $(NITROS9DIR)/level2
 6809L1		= $(NITROS9DIR)/6809l1
 6809L2		= $(NITROS9DIR)/6809l2
 6309L2		= $(NITROS9DIR)/6309l2