changeset 2869:cfa6222348f7

makefiles: Separate OS9COPY and CP macros
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 24 Nov 2013 11:18:28 +0100
parents cfa46960b6bd
children 91d0226c431a
files 3rdparty/customboots/boisy/makefile 3rdparty/packages/arcadepak/makefile 3rdparty/packages/basic09/makefile 3rdparty/packages/cc/makefile 3rdparty/packages/deskmate3/makefile 3rdparty/packages/fsim2/makefile 3rdparty/packages/koronis/makefile 3rdparty/packages/kyumgai/makefile 3rdparty/packages/mm/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/os9l2bbs/6809l2/makefile 3rdparty/packages/raakatu/makefile 3rdparty/packages/rof/makefile 3rdparty/packages/sierra/blackcauldron/makefile 3rdparty/packages/sierra/christmas86/makefile 3rdparty/packages/sierra/goldrush/makefile 3rdparty/packages/sierra/kingsquest1/makefile 3rdparty/packages/sierra/kingsquest2/makefile 3rdparty/packages/sierra/kingsquest3/makefile 3rdparty/packages/sierra/kingsquest4/makefile 3rdparty/packages/sierra/leisuresuitlarry/makefile 3rdparty/packages/sierra/manhunter1/makefile 3rdparty/packages/sierra/manhunter2/makefile 3rdparty/packages/sierra/policequest1/makefile 3rdparty/packages/sierra/spacequest0/makefile 3rdparty/packages/sierra/spacequest1/makefile 3rdparty/packages/sierra/spacequest2/makefile 3rdparty/packages/subsim/makefile 3rdparty/packages/uucpbb/makefile level1/atari/makefile level1/atari/modules/makefile level1/coco/makefile level1/coco/modules/makefile level1/d64/makefile level1/d64/modules/makefile level1/dalpha/makefile level1/dalpha/modules/makefile level1/tano/makefile level1/tano/modules/makefile level2/coco3/modules/makefile level3/coco3/makefile level3/coco3/modules/makefile level3/coco3_6309/makefile level3/coco3_6309/modules/makefile rules.mak
diffstat 45 files changed, 503 insertions(+), 502 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/customboots/boisy/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/customboots/boisy/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -111,11 +111,11 @@
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
-	$(CP) $(CMDS) $(CMDS_DW) $(CMDS_THESIS) $@,CMDS
+	$(OS9COPY) $(CMDS) $(CMDS_DW) $(CMDS_THESIS) $@,CMDS
 	$(foreach file, $(CMDS) $(CMDS_DW) $(CMDS_THESIS), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
 	$(MAKDIR) $@,SRC
 	$(CPL) $(SRC_THESIS) $@,SRC
-	$(CP) $(3RDPARTY)/utils/supercomm/supercomm $@,CMDS
+	$(OS9COPY) $(3RDPARTY)/utils/supercomm/supercomm $@,CMDS
 	$(OS9ATTR_EXEC) $@,CMDS/supercomm
 	$(CPL) $(SYSTEXT) $@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
--- a/3rdparty/packages/arcadepak/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/arcadepak/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -96,24 +96,24 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel_1773
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $@,CMDS
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9COPY) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9COPY) smash/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9COPY) thexder/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9COPY) shanghai/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,SYS
-	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
-	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
-	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
-	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
-	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
-	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(foreach file, $(SMASHSYS), $(OS9COPY) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(OS9COPY) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(OS9COPY) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(OS9COPY) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(OS9COPY) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(OS9COPY) shanghai/$(file) $@,$(file);)
 	$(CPL) startup $@,
 
 $(DISK_80D): all
@@ -125,24 +125,24 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel_1773
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $@,CMDS
-	$(CP) shell $@,CMDS/shell
+	$(OS9COPY) shell $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9COPY) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9COPY) smash/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9COPY) thexder/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9COPY) shanghai/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,SYS
-	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
-	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
-	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
-	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
-	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
-	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(foreach file, $(SMASHSYS), $(OS9COPY) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(OS9COPY) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(OS9COPY) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(OS9COPY) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(OS9COPY) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(OS9COPY) shanghai/$(file) $@,$(file);)
 	$(CPL) startup $@,
 
 $(DISK_DW): all
@@ -154,24 +154,24 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) shell $@,CMDS/shell
+	$(OS9COPY) shell $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9COPY) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9COPY) smash/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9COPY) thexder/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9COPY) shanghai/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,SYS
-	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
-	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
-	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
-	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
-	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
-	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(foreach file, $(SMASHSYS), $(OS9COPY) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(OS9COPY) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(OS9COPY) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(OS9COPY) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(OS9COPY) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(OS9COPY) shanghai/$(file) $@,$(file);)
 	$(CPL) startup $@,
 
 $(DISK_BECKER): all
@@ -183,24 +183,24 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) shell $@,CMDS/shell
+	$(OS9COPY) shell $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9COPY) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9COPY) smash/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9COPY) thexder/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9COPY) shanghai/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,SYS
-	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
-	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
-	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
-	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
-	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
-	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(foreach file, $(SMASHSYS), $(OS9COPY) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(OS9COPY) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(OS9COPY) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(OS9COPY) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(OS9COPY) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(OS9COPY) shanghai/$(file) $@,$(file);)
 	$(CPL) startup $@,
 
 clean:	dskclean
--- a/3rdparty/packages/basic09/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/basic09/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -49,7 +49,7 @@
 	$(RM) $(DISK)
 	$(OS9FORMAT_SS35) $(DISK) -n"Basic09"
 	$(MAKDIR) $(DISK),CMDS
-	$(CP) $(ALLOBJS) $(DISK),CMDS
+	$(OS9COPY) $(ALLOBJS) $(DISK),CMDS
 	$(foreach file, $(ALLOBJS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(CPL) $(TXTFILES) $(DISK),.
 	$(foreach file, $(TXTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
--- a/3rdparty/packages/cc/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/cc/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -30,10 +30,10 @@
 	$(MAKDIR) $(DISK),DEFS
 	$(MAKDIR) $(DISK),SOURCES
 	$(MAKDIR) $(DISK),SOURCES/SYS
-	$(CP) $(CMDS) $(DISK),CMDS
+	$(OS9COPY) $(CMDS) $(DISK),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(CPL) defs/*.h $(DISK),DEFS
-	$(CP) lib/*.l lib/*.r $(DISK),LIB
+	$(OS9COPY) lib/*.l lib/*.r $(DISK),LIB
 	$(CPL) sources/*.c $(DISK),SOURCES
 	$(CPL) sources/*.a $(DISK),SOURCES/SYS
 
--- a/3rdparty/packages/deskmate3/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/deskmate3/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -47,13 +47,13 @@
 	$(OS9GEN) $(DISK) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $(DISK),CMDS
-	$(CP) $(UTILS) $(DISK),CMDS
+	$(OS9COPY) $(UTILS) $(DISK),CMDS
 	$(foreach file, $(UTILS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(notdir $(file));)
-	$(CP) $(CMDS) $(DISK),CMDS
+	$(OS9COPY) $(CMDS) $(DISK),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(notdir $(file));)
 	$(CPL) $(HELP) $(DISK),CMDS
 	$(foreach file, $(HELP), $(OS9ATTR_EXEC) $(DISK),CMDS/$(notdir $(file));)
-	$(CP) $(ROOTFILES) $(DISK),.
+	$(OS9COPY) $(ROOTFILES) $(DISK),.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $(DISK),$(file);)
 
 dskcopy: dsk
--- a/3rdparty/packages/fsim2/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/fsim2/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -69,12 +69,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/fs AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK_DW_BECKER):
@@ -86,12 +86,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/fs AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK_FLOPPY):
@@ -103,12 +103,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/fs AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 dskcopy: dsk
--- a/3rdparty/packages/koronis/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/koronis/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -65,12 +65,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/koronis AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DSK_DW):
 	$(RM) $@
@@ -81,12 +81,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/koronis AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK_DW_BECKER):
@@ -98,12 +98,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/koronis AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 dskcopy: dsk
--- a/3rdparty/packages/kyumgai/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/kyumgai/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -69,12 +69,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/ninja AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK_DW):
@@ -86,12 +86,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/ninja AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK_DW_BECKER):
@@ -103,12 +103,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/ninja AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 dskcopy: dsk
--- a/3rdparty/packages/mm/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/mm/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -64,12 +64,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/mm AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)
 
 $(DSK_DW):
@@ -81,12 +81,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/mm AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)
 
 $(DSK_DW_BECKER):
@@ -98,12 +98,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/mm AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)
 
 dskcopy: dsk
--- a/3rdparty/packages/multivue/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/multivue/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -132,12 +132,12 @@
 	$(MAKDIR) $@,CMDS/ICONS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEMO
-	$(CD) cmds_6809; $(CP) $(CMDS68) ../$@,CMDS
+	$(CD) cmds_6809; $(OS9COPY) $(CMDS68) ../$@,CMDS
 	$(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
 	$(OS9RENAME) $@,CMDS/gshell AutoEx
-	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(CD) icons; $(OS9COPY) $(ICONS) ../$@,CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -157,12 +157,12 @@
 	$(MAKDIR) $@,CMDS/ICONS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEMO
-	$(CD) cmds_6309; $(CP) $(CMDS63) ../$@,CMDS
+	$(CD) cmds_6309; $(OS9COPY) $(CMDS63) ../$@,CMDS
 	$(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
 	$(OS9RENAME) $@,CMDS/gshell AutoEx
-	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(CD) icons; $(OS9COPY) $(ICONS) ../$@,CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -182,12 +182,12 @@
 	$(MAKDIR) $@,CMDS/ICONS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEMO
-	$(CD) cmds_6809; $(CP) $(CMDS68) ../$@,CMDS
+	$(CD) cmds_6809; $(OS9COPY) $(CMDS68) ../$@,CMDS
 	$(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
 	$(OS9RENAME) $@,CMDS/gshell AutoEx
-	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(CD) icons; $(OS9COPY) $(ICONS) ../$@,CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -207,12 +207,12 @@
 	$(MAKDIR) $@,CMDS/ICONS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEMO
-	$(CD) cmds_6809; $(CP) $(CMDS68) ../$@,CMDS
+	$(CD) cmds_6809; $(OS9COPY) $(CMDS68) ../$@,CMDS
 	$(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
 	$(OS9RENAME) $@,CMDS/gshell AutoEx
-	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(CD) icons; $(OS9COPY) $(ICONS) ../$@,CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -232,12 +232,12 @@
 	$(MAKDIR) $@,CMDS/ICONS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEMO
-	$(CD) cmds_6309; $(CP) $(CMDS63) ../$@,CMDS
+	$(CD) cmds_6309; $(OS9COPY) $(CMDS63) ../$@,CMDS
 	$(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
 	$(OS9RENAME) $@,CMDS/gshell AutoEx
-	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(CD) icons; $(OS9COPY) $(ICONS) ../$@,CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -257,12 +257,12 @@
 	$(MAKDIR) $@,CMDS/ICONS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEMO
-	$(CD) cmds_6309; $(CP) $(CMDS63) ../$@,CMDS
+	$(CD) cmds_6309; $(OS9COPY) $(CMDS63) ../$@,CMDS
 	$(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
 	$(OS9RENAME) $@,CMDS/gshell AutoEx
-	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(CD) icons; $(OS9COPY) $(ICONS) ../$@,CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
--- a/3rdparty/packages/os9l2bbs/6809l2/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/os9l2bbs/6809l2/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -33,9 +33,9 @@
 dsk:
 	$(OS9FORMAT) -q $(DSK)
 	$(MAKDIR) $(DSK),CMDS
-	$(CP) $(CMDS) $(DSK),CMDS
+	$(OS9COPY) $(CMDS) $(DSK),CMDS
 	$(MAKDIR) $(DSK),BBS
-	$(CP) $(BBSFILES) $(DSK),BBS
+	$(OS9COPY) $(BBSFILES) $(DSK),BBS
 
 clean: dskclean
 	-$(RM) $(CMDS)
--- a/3rdparty/packages/raakatu/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/raakatu/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -37,10 +37,10 @@
 	$(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
-	$(CP) $(CMDS) $(DISK),CMDS
+	$(OS9COPY) $(CMDS) $(DISK),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
 	$(OS9RENAME) $(DISK),CMDS/raakatu AutoEx
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $(DISK),CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $(DISK),CMDS/shell
 	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
 #	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $(DISK),SUB/$(file);)
 
--- a/3rdparty/packages/rof/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/rof/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -63,12 +63,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/rescue AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK_DW):
@@ -80,12 +80,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/rescue AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK_DW_BECKER):
@@ -97,12 +97,12 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/rescue AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 dskcopy: dsk
--- a/3rdparty/packages/sierra/blackcauldron/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/blackcauldron/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -94,21 +94,21 @@
 	$(OS9GEN) $(DSK_1_40D) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $(DSK_1_40D),CMDS
-	$(CP) $(CMDS) $(DSK_1_40D),CMDS
+	$(OS9COPY) $(CMDS) $(DSK_1_40D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_1_40D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_1_40D),CMDS
+	$(OS9COPY) shell $(DSK_1_40D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DSK_1_40D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DSK_1_40D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DSK_1_40D),.
 	$(OS9RENAME) $(DSK_1_40D),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $(DSK_1_40D),.
+	$(OS9COPY) $(SUPPORTFILES_D1) $(DSK_1_40D),.
 	$(MOVE) tocgen toctmp
 	tocgen $(DSK_1_40D),tOC.txt $(DSK_1_40D),tOC
 	$(MOVE) toctmp tocgen
 	$(OS9FORMAT_DS40) -q $(DSK_2_40D) -n$(DSK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $(DSK_2_40D),.
+	$(OS9COPY) $(SUPPORTFILES_D2) $(DSK_2_40D),.
 
 dsk_80d:	all
 	$(RM) $(DSK_80D)
@@ -119,16 +119,16 @@
 	$(OS9GEN) $(DSK_80D) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $(DSK_80D),CMDS
-	$(CP) $(CMDS) $(DSK_80D),CMDS
+	$(OS9COPY) $(CMDS) $(DSK_80D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_80D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_80D),CMDS
+	$(OS9COPY) shell $(DSK_80D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DSK_80D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DSK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DSK_80D),.
 	$(OS9RENAME) $(DSK_80D),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_80D),.
+	$(OS9COPY) $(SUPPORTFILES) $(DSK_80D),.
 	$(MOVE) tocgen toctmp
 	tocgen $(DSK_80D),tOC.txt $(DSK_80D),tOC
 	$(MOVE) toctmp tocgen
@@ -142,16 +142,16 @@
 	$(OS9GEN) $(DSK_DW) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $(DSK_DW),CMDS
-	$(CP) $(CMDS) $(DSK_DW),CMDS
+	$(OS9COPY) $(CMDS) $(DSK_DW),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW),CMDS
+	$(OS9COPY) shell $(DSK_DW),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DSK_DW),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DSK_DW),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DSK_DW),.
 	$(OS9RENAME) $(DSK_DW),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW),.
+	$(OS9COPY) $(SUPPORTFILES) $(DSK_DW),.
 	$(MOVE) tocgen toctmp
 	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
 	$(MOVE) toctmp tocgen
@@ -165,16 +165,16 @@
 	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $(DSK_DW_BECKER),CMDS
-	$(CP) $(CMDS) $(DSK_DW_BECKER),CMDS
+	$(OS9COPY) $(CMDS) $(DSK_DW_BECKER),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW_BECKER),CMDS
+	$(OS9COPY) shell $(DSK_DW_BECKER),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DSK_DW_BECKER),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DSK_DW_BECKER),.
 	$(OS9RENAME) $(DSK_DW_BECKER),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW_BECKER),.
+	$(OS9COPY) $(SUPPORTFILES) $(DSK_DW_BECKER),.
 	$(MOVE) tocgen toctmp
 	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/christmas86/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/christmas86/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -76,10 +76,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -87,7 +87,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DSK_DW):	all
 	$(RM) $@
@@ -98,10 +98,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -109,7 +109,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DSK_DW_BECKER):	all
 	$(RM) $@
@@ -120,10 +120,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -131,7 +131,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/goldrush/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/goldrush/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -91,16 +91,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_ALL) $@,.
+	$(OS9COPY) $(SUPPORTFILES_ALL) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -114,16 +114,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW_BECKER) $@,.
 	$(OS9RENAME) $@,tOC_dw_becker.txt tOC.txt
-	$(CP) $(SUPPORTFILES_ALL) $@,.
+	$(OS9COPY) $(SUPPORTFILES_ALL) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -137,16 +137,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -155,12 +155,12 @@
 $(DISK_2_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DISK_3_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -78,10 +78,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -90,7 +90,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DSKDW):
 	$(RM) $@
@@ -101,10 +101,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -113,7 +113,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DSKDWBECKER):
 	$(RM) $@
@@ -124,10 +124,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -136,7 +136,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -95,16 +95,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen 
@@ -112,7 +112,7 @@
 $(DSK_2_40D):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n$(DSK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DSK_80D):
 	$(RM) $@
@@ -123,16 +123,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -146,16 +146,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -169,16 +169,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -101,23 +101,23 @@
 	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
 	$(RM) os9boot_40d kernel_1773
 	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_1_40D),CMDS
+	$(OS9COPY) $(CMDS) $(DISK_1_40D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_40D),CMDS
+	$(OS9COPY) shell $(DISK_1_40D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
 	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(OS9COPY) $(SUPPORTFILES_D1) $(DISK_1_40D),.
 	$(MOVE) tocgen toctmp
 	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
 	$(MOVE) toctmp tocgen
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
+	$(OS9COPY) $(SUPPORTFILES_D2) $(DISK_2_40D),.
 	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
+	$(OS9COPY) $(SUPPORTFILES_D3) $(DISK_3_40D),.
 
 dsk_80d:	all
 	$(RM) $(DISK_80D)
@@ -128,16 +128,16 @@
 	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
 	$(RM) os9boot_80d kernel_1773
 	$(MAKDIR) $(DISK_80D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
+	$(OS9COPY) $(CMDS) $(DISK_80D),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_80D),CMDS
+	$(OS9COPY) shell $(DISK_80D),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $(DISK_80D),.
 	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DISK_80D),.
+	$(OS9COPY) $(SUPPORTFILES) $(DISK_80D),.
 	$(MOVE) tocgen toctmp
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
 	$(MOVE) toctmp tocgen
@@ -151,16 +151,16 @@
 	$(OS9GEN) $(DSK_DW) -b=os9boot_dw -t=kernel_dw
 	$(RM) os9boot_dw kernel_dw
 	$(MAKDIR) $(DSK_DW),CMDS
-	$(CP) $(CMDS) $(DSK_DW),CMDS
+	$(OS9COPY) $(CMDS) $(DSK_DW),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW),CMDS
+	$(OS9COPY) shell $(DSK_DW),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DSK_DW),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DSK_DW),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $(DSK_DW),.
 	$(OS9RENAME) $(DSK_DW),tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW),.
+	$(OS9COPY) $(SUPPORTFILES) $(DSK_DW),.
 	$(MOVE) tocgen toctmp
 	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
 	$(MOVE) toctmp tocgen
@@ -174,16 +174,16 @@
 	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot_dw -t=kernel_dw
 	$(RM) os9boot_dw kernel_dw
 	$(MAKDIR) $(DSK_DW_BECKER),CMDS
-	$(CP) $(CMDS) $(DSK_DW_BECKER),CMDS
+	$(OS9COPY) $(CMDS) $(DSK_DW_BECKER),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW_BECKER),CMDS
+	$(OS9COPY) shell $(DSK_DW_BECKER),CMDS
 	$(RM) shell
 	$(OS9ATTR) $(DSK_DW_BECKER),CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $(DSK_DW_BECKER),.
 	$(OS9RENAME) $(DSK_DW_BECKER),tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW_BECKER),.
+	$(OS9COPY) $(SUPPORTFILES) $(DSK_DW_BECKER),.
 	$(MOVE) tocgen toctmp
 	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/kingsquest4/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/kingsquest4/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -92,16 +92,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -109,12 +109,12 @@
 $(DISK_2_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DISK_3_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 $(DISK_DW):
 	$(RM) $@
@@ -124,16 +124,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(OS9COPY) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -146,16 +146,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(OS9COPY) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -71,10 +71,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -89,10 +89,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -107,10 +107,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/manhunter1/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/manhunter1/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -92,16 +92,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -114,16 +114,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(OS9COPY) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -136,16 +136,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(OS9COPY) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -153,12 +153,12 @@
 $(DISK_2_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DISK_3_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/manhunter2/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/manhunter2/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -90,16 +90,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -107,12 +107,12 @@
 $(DISK_2_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DISK_3_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 $(DISK_DW):
 	$(RM) $@
@@ -122,16 +122,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(OS9COPY) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -144,16 +144,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(OS9COPY) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/policequest1/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/policequest1/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -91,16 +91,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -108,12 +108,12 @@
 $(DISK_2_40D):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DISK_3_40D):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 $(DISK_DW):
 	$(RM) $@
@@ -124,16 +124,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -147,16 +147,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/spacequest0/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/spacequest0/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -105,10 +105,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -117,17 +117,17 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 
 $(DISK_2_40D):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DISK_3_40D):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 $(DISK_1_80D):
 	$(RM) $@
@@ -138,10 +138,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -150,12 +150,12 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DISK_2_80D):
 	$(RM) $@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 $(DISK_DW):
 	$(RM) $@
@@ -166,10 +166,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -178,7 +178,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DISK_DW_BECKER):
 	$(RM) $@
@@ -189,10 +189,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -201,7 +201,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 dsk:	all $(DSKS)
 
--- a/3rdparty/packages/sierra/spacequest1/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/spacequest1/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -95,10 +95,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -107,12 +107,12 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 
 $(DISK_2_40D):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DISK_80D):
 	$(RM) $@
@@ -123,10 +123,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -135,7 +135,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DISK_DW):
 	$(RM) $@
@@ -146,10 +146,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -158,7 +158,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DISK_DW_BECKER):
 	$(RM) $@
@@ -169,10 +169,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -181,7 +181,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 dsk:	all $(DSKS)
 
--- a/3rdparty/packages/sierra/spacequest2/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/sierra/spacequest2/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -100,16 +100,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -117,12 +117,12 @@
 $(DISK_2_40D):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D2) $@,.
 
 $(DISK_3_40D):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 $(DISK_80D):
 	$(RM) $@
@@ -133,16 +133,16 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
@@ -156,10 +156,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -168,7 +168,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 $(DISK_DW_BECKER):
 	$(RM) $@
@@ -179,10 +179,10 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $@,CMDS
+	$(OS9COPY) shell $@,CMDS
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
@@ -191,7 +191,7 @@
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $@,.
+	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 dsk:	all $(DSKS)
 
--- a/3rdparty/packages/subsim/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/subsim/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -65,13 +65,13 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS $@,SUB
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
 	$(OS9RENAME) $@,CMDS/presub AutoEx
-	$(CP) $(SUPPORTFILES) $@,SUB
-	$(CP) sub6 $@,SUB
+	$(OS9COPY) $(SUPPORTFILES) $@,SUB
+	$(OS9COPY) sub6 $@,SUB
 	$(OS9ATTR_EXEC) $@,SUB/sub6
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
 
@@ -84,13 +84,13 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS $@,SUB
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
 	$(OS9RENAME) $@,CMDS/presub AutoEx
-	$(CP) $(SUPPORTFILES) $@,SUB
-	$(CP) sub6 $@,SUB
+	$(OS9COPY) $(SUPPORTFILES) $@,SUB
+	$(OS9COPY) sub6 $@,SUB
 	$(OS9ATTR_EXEC) $@,SUB/sub6
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
 
@@ -103,13 +103,13 @@
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS $@,SUB
-	$(CP) $(CMDS) $@,CMDS
+	$(OS9COPY) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9COPY) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
 	$(OS9RENAME) $@,CMDS/presub AutoEx
-	$(CP) $(SUPPORTFILES) $@,SUB
-	$(CP) sub6 $@,SUB
+	$(OS9COPY) $(SUPPORTFILES) $@,SUB
+	$(OS9COPY) sub6 $@,SUB
 	$(OS9ATTR_EXEC) $@,SUB/sub6
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
 
--- a/3rdparty/packages/uucpbb/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/3rdparty/packages/uucpbb/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -50,9 +50,9 @@
 	$(MAKDIR) $(DISK68),SYS/UUCP
 	$(CD) sample_config; $(CPL) $(CONFIG) ../$(DISK68),SYS/UUCP
 	$(CPL) profile $(DISK68),SYS
-	$(CD) cmds_6809; $(CP) $(CMDS68TCAP) ../$(DISK68),UUCP/CMDS_TCAP
+	$(CD) cmds_6809; $(OS9COPY) $(CMDS68TCAP) ../$(DISK68),UUCP/CMDS_TCAP
 	$(foreach file, $(CMDS68TCAP), $(OS9ATTR_EXEC) $(DISK68),UUCP/CMDS_TCAP/$(notdir $(file));)
-	$(CD) cmds_6809; $(CP) $(CMDS68WIN) ../$(DISK68),UUCP/CMDS_WIN
+	$(CD) cmds_6809; $(OS9COPY) $(CMDS68WIN) ../$(DISK68),UUCP/CMDS_WIN
 	$(foreach file, $(CMDS68WIN), $(OS9ATTR_EXEC) $(DISK68),UUCP/CMDS_WIN/$(notdir $(file));)
 	$(CD) doc; $(CPL) $(DOCS) ../$(DISK68),UUCP/DOC
 	$(CPL) copying readme.first $(DISK68),UUCP
@@ -75,9 +75,9 @@
 	$(MAKDIR) $(DISK63),SYS/UUCP
 	$(CD) sample_config; $(CPL) $(CONFIG) ../$(DISK63),SYS/UUCP
 	$(CPL) profile $(DISK63),SYS
-	$(CD) cmds_6309; $(CP) $(CMDS63TCAP) ../$(DISK63),UUCP/CMDS_TCAP
+	$(CD) cmds_6309; $(OS9COPY) $(CMDS63TCAP) ../$(DISK63),UUCP/CMDS_TCAP
 	$(foreach file, $(CMDS63TCAP), $(OS9ATTR_EXEC) $(DISK63),UUCP/CMDS_TCAP/$(notdir $(file));)
-	$(CD) cmds_6309; $(CP) $(CMDS63WIN) ../$(DISK63),UUCP/CMDS_WIN
+	$(CD) cmds_6309; $(OS9COPY) $(CMDS63WIN) ../$(DISK63),UUCP/CMDS_WIN
 	$(foreach file, $(CMDS63WIN), $(OS9ATTR_EXEC) $(DISK63),UUCP/CMDS_WIN/$(notdir $(file));)
 	$(CD) doc; $(CPL) $(DOCS) ../$(DISK63),UUCP/DOC
 	$(CPL) copying readme.first $(DISK63),UUCP
--- a/level1/atari/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/atari/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -64,7 +64,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -78,7 +78,7 @@
 	$(RM) $@
 	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9 Atari Demo Disk"
 	$(MAKDIR) $@,CMDS
-	$(CD) cmds; $(CP) $(CMDS_DEMO) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_DEMO) ../$@,CMDS
 	$(foreach file, $(CMDS_DEMO), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 
 info:
--- a/level1/atari/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/atari/modules/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -42,7 +42,7 @@
 # Kernel
 krn krnp2:
 	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+	$(OS9COPY) kernel/$@ .
 
 
 sysgo_rom: sysgo.asm
--- a/level1/coco/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/coco/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -101,9 +101,9 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -115,30 +115,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
@@ -155,9 +155,9 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -169,30 +169,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
@@ -208,9 +208,9 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_DW) ../$@,CMDS
 	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -222,30 +222,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
@@ -260,7 +260,7 @@
 	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -277,35 +277,35 @@
 	$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/6809 Level 1 Disk 2"
 	$(MAKDIR) $@,CMDS
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS//$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
@@ -321,9 +321,9 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -335,30 +335,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
--- a/level1/coco/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/coco/modules/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -75,7 +75,7 @@
 # Kernel
 krn krnp2:
 	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+	$(OS9COPY) kernel/$@ .
 
 # Special cases
 # TC^3 SCSI Booter
--- a/level1/d64/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/d64/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -146,7 +146,7 @@
 	$(OS9GEN) $@ -d -b=$(BOOTFILE_DS40) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -165,30 +165,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS//$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
@@ -204,7 +204,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -216,30 +216,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
@@ -255,7 +255,7 @@
 	$(OS9GEN) $@ -d -b=$(BOOTFILE_SS40) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
-	$(CD) cmds; $(CP) $(CMDS525) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS525) ../$@,CMDS
 	$(foreach file, $(CMDS525), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -272,7 +272,7 @@
 	$(RM) $@
 	$(OS9FORMAT_SS40) -e -dr -q $@ -n"NitrOS-9/6809/Dragon Level 1 Disk 2"
 	$(MAKDIR) $@,CMDS
-	$(CD) cmds; $(CP) $(CMDS525_2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS525_2) ../$@,CMDS
 	$(foreach file, $(CMDS525_2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 
 info:
--- a/level1/d64/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/d64/modules/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -81,7 +81,7 @@
 # Kernel
 krn krnp2:
 	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+	$(OS9COPY) kernel/$@ .
 
 boot_d64:	boot_d64.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP)
--- a/level1/dalpha/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/dalpha/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -138,7 +138,7 @@
 	$(OS9GEN) $@ -d -b=$(BOOTFILE_SS80) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -157,30 +157,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS//$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
@@ -196,7 +196,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -208,30 +208,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
--- a/level1/dalpha/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/dalpha/modules/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -80,7 +80,7 @@
 # Kernel
 krn krnp2:
 	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+	$(OS9COPY) kernel/$@ .
 
 boot_dalpha:	boot_d64.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP)
--- a/level1/tano/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/tano/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -81,7 +81,7 @@
 	$(OS9GEN) $@ -d -b=$(BOOTFILE_COVDG) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -100,30 +100,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS//$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
@@ -139,7 +139,7 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
@@ -151,30 +151,30 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/6809L1
 	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
 	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
--- a/level1/tano/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level1/tano/modules/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -58,7 +58,7 @@
 # Kernel
 krn krnp2:
 	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+	$(OS9COPY) kernel/$@ .
 
 boot_1773_6ms:	boot_1773.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=0
--- a/level2/coco3/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level2/coco3/modules/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -95,7 +95,7 @@
 # Kernel
 ccbkrn krn krnp2:
 	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+	$(OS9COPY) kernel/$@ .
 
 # Special cases
 # TC^3 SCSI Booter
--- a/level3/coco3/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level3/coco3/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -89,11 +89,11 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -104,29 +104,29 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
@@ -142,11 +142,11 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -164,11 +164,11 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -183,34 +183,34 @@
 	-$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 2"
 	$(MAKDIR) $@,CMDS
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
@@ -226,13 +226,13 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -243,29 +243,29 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
@@ -281,13 +281,13 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -298,29 +298,29 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
--- a/level3/coco3/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level3/coco3/modules/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -83,7 +83,7 @@
 # Kernel
 krn krnp2:
 	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+	$(OS9COPY) kernel/$@ .
 
 # Special cases
 cogrf.io: cowin.asm
--- a/level3/coco3_6309/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level3/coco3_6309/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -85,11 +85,11 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -107,11 +107,11 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -126,34 +126,34 @@
 	-$(RM) $@
 	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 3 Disk 2"
 	$(MAKDIR) $@,CMDS
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
@@ -169,13 +169,13 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -186,29 +186,29 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
@@ -224,13 +224,13 @@
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
+	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
@@ -241,29 +241,29 @@
 	$(MAKDIR) $@,NITROS9
 	$(MAKDIR) $@,NITROS9/$(DISTRO)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
 	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
 	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
 	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
 	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
 	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
 	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
 	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
 	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
--- a/level3/coco3_6309/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
+++ b/level3/coco3_6309/modules/makefile	Sun Nov 24 11:18:28 2013 +0100
@@ -83,7 +83,7 @@
 # Kernel
 krn krnp2:
 	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
+	$(OS9COPY) kernel/$@ .
 
 # Special cases
 cogrf.io: cowin.asm
--- a/rules.mak	Sun Nov 24 11:13:40 2013 +0100
+++ b/rules.mak	Sun Nov 24 11:18:28 2013 +0100
@@ -64,7 +64,8 @@
 MOVE		= mv
 ECHO		= /bin/echo
 CD		= cd
-CP		= os9 copy -o=0
+CP		= cp
+OS9COPY		= os9 copy -o=0
 CPL		= $(CP) -l
 TAR		= tar
 CHMOD		= chmod