--- a/level2/coco3/cmds/makefile	Sun Sep 24 22:46:45 2006 +0000
+++ b/level2/coco3/cmds/makefile	Fri Sep 29 16:16:25 2006 +0000
@@ -1,26 +1,27 @@
 PORT = coco3
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
+vpath %.asm $(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
 
 DEPENDS		= ./makefile
+AFLAGS		+= -i=$(NITROS9DIR)/3rdparty/packages/basic09
 
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
 		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
 		display dmem dmode dsave dump echo edit error exbin \
 		format free grfdrv help ident iniz irqs link list load login \
 		makdir mdir megaread merge mfree mmap modpatch montype mpi os9gen padrom park \
-		pmap proc procs prompt pwd pxd reboot rename runb save setime \
-		shell_21 sleep smap tee tmode touch \
-		tsmon tuneport unlink verify wcreate xmode
-SUBS            = gfx2 gfx inkey syscall
+		pmap proc procs prompt pwd pxd reboot rename save setime \
+		shell_21 sleep smap tee tmode touch tsmon tuneport unlink verify wcreate xmode
+
+CMDS_D2         = basic09 runb gfx2 gfx inkey syscall
 
 SHELLMODS	= shellplus date deiniz echo iniz link load save unlink
 UTILPAK1	= attr build copy del deldir dir display list makdir mdir \
 		merge mfree procs rename tmode
 
 # Files not compilable by os9asm: config
-all:	$(SUBS) $(CMDS) shell utilpak1 $(DEPENDS)
+all:	$(CMDS) $(CMDS_D2) shell utilpak1 $(DEPENDS)
 
 runb:	runb.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
@@ -53,11 +54,14 @@
 	@$(ECHO) ""
 
 clean:
-	$(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS)
+	$(RM) shell utilpak1 $(SUBS) $(SHELLMODS) $(CMDS) $(CMDS_D2)
 
 # Only $(CMDS) are shown here
 showobjs:
 	@$(ECHO) shell utilpak1 $(CMDS)
 
+showobjs_d2:
+	@$(ECHO) $(CMDS_D2)
+
 identify:
 	$(IDENT_SHORT) $(ALLOBJS)