# HG changeset patch
# User Tormod Volden <debian.tormod@gmail.com>
# Date 1373709216 -7200
# Node ID d5220b2203134112894e543f0282de6f9a4f1713
# Parent  84d284e812cdb993151fb019afada290c7b7bcc6
Makefiles: Use native cp for copying dsk images

The "os9 copy" is not able to do this on Cygwin,
and is not the right tool for the job anyway.

Thanks to Bob Devries for reporting this issue!

diff -r 84d284e812cd -r d5220b220313 3rdparty/customboots/boisy/makefile
--- a/3rdparty/customboots/boisy/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/customboots/boisy/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -122,7 +122,7 @@
 	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$@,$(file))
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/arcadepak/makefile
--- a/3rdparty/packages/arcadepak/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/arcadepak/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -207,7 +207,7 @@
 	$(CD) shanghai; make clean
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS) 
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/fsim2/makefile
--- a/3rdparty/packages/fsim2/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/fsim2/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -109,7 +109,7 @@
 	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$@,$(file))
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/koronis/makefile
--- a/3rdparty/packages/koronis/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/koronis/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -104,7 +104,7 @@
 	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$@,$(file))
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/kyumgai/makefile
--- a/3rdparty/packages/kyumgai/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/kyumgai/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -109,7 +109,7 @@
 	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$@,$(file))
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/mm/makefile
--- a/3rdparty/packages/mm/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/mm/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -104,7 +104,7 @@
 	$(OS9ATTR_EXEC) $(foreach file,$(SUPPORTFILES),$@,$(file))
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/multivue/makefile
--- a/3rdparty/packages/multivue/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/multivue/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -270,7 +270,7 @@
 	$(OS9ATTR_TEXT) $(foreach file,$(ROOTFILES),$@,$(file))
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/rof/makefile
--- a/3rdparty/packages/rof/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/rof/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -103,7 +103,7 @@
 	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$@,$(file))
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/blackcauldron/makefile
--- a/3rdparty/packages/sierra/blackcauldron/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/blackcauldron/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -180,7 +180,7 @@
 dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/christmas86/makefile
--- a/3rdparty/packages/sierra/christmas86/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/christmas86/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -131,7 +131,7 @@
 	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/goldrush/makefile
--- a/3rdparty/packages/sierra/goldrush/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/goldrush/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -159,7 +159,7 @@
 	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/kingsquest1/makefile
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -136,7 +136,7 @@
 	$(OS9COPY) $(SUPPORTFILES) $@,.
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/kingsquest2/makefile
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -183,7 +183,7 @@
 dsk:	all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/kingsquest3/makefile
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -188,7 +188,7 @@
 dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/kingsquest4/makefile
--- a/3rdparty/packages/sierra/kingsquest4/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/kingsquest4/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -158,7 +158,7 @@
 	$(MOVE) toctmp tocgen
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/leisuresuitlarry/makefile
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -114,7 +114,7 @@
 	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$@,$(file))
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/manhunter1/makefile
--- a/3rdparty/packages/sierra/manhunter1/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/manhunter1/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -158,7 +158,7 @@
 	$(OS9COPY) $(SUPPORTFILES_D3) $@,.
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/manhunter2/makefile
--- a/3rdparty/packages/sierra/manhunter2/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/manhunter2/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -157,7 +157,7 @@
 
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/policequest1/makefile
--- a/3rdparty/packages/sierra/policequest1/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/policequest1/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -160,7 +160,7 @@
 
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/spacequest0/makefile
--- a/3rdparty/packages/sierra/spacequest0/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/spacequest0/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -203,7 +203,7 @@
 dsk:	all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/spacequest1/makefile
--- a/3rdparty/packages/sierra/spacequest1/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/spacequest1/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -183,7 +183,7 @@
 dsk:	all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/sierra/spacequest2/makefile
--- a/3rdparty/packages/sierra/spacequest2/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/sierra/spacequest2/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -193,7 +193,7 @@
 dsk:	all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/subsim/makefile
--- a/3rdparty/packages/subsim/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/subsim/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -111,7 +111,7 @@
 	$(OS9ATTR_TEXT) $(foreach file,$(SUPPORTFILES),$@,SUB/$(file))
 
 dskcopy:	dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/packages/uucpbb/makefile
--- a/3rdparty/packages/uucpbb/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/packages/uucpbb/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -80,7 +80,7 @@
 	$(CPL) copying readme.first $(DISK63),UUCP
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 dskclean:
 	$(RM) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/utils/boisy/makefile
--- a/3rdparty/utils/boisy/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/utils/boisy/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -33,7 +33,7 @@
 dsk: all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 clean:
 	$(RM) $(ALLOBJS) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/utils/dasm/makefile
--- a/3rdparty/utils/dasm/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/utils/dasm/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -29,7 +29,7 @@
 dsk: all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 clean:
 	$(RM) $(ALLOBJS) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/utils/dladd/makefile
--- a/3rdparty/utils/dladd/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/utils/dladd/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -29,7 +29,7 @@
 dsk: all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 clean:
 	$(RM) $(ALLOBJS) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/utils/smartwatch/makefile
--- a/3rdparty/utils/smartwatch/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/utils/smartwatch/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -29,7 +29,7 @@
 dsk: all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 clean:
 	$(RM) $(ALLOBJS) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/utils/supercomm/makefile
--- a/3rdparty/utils/supercomm/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/utils/supercomm/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -29,7 +29,7 @@
 dsk: all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 clean:
 	$(RM) $(ALLOBJS) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 3rdparty/utils/winfo/makefile
--- a/3rdparty/utils/winfo/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/3rdparty/utils/winfo/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -32,7 +32,7 @@
 dsk: all $(DSKS)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 clean:
 	$(RM) $(ALLOBJS) $(DSKS)
diff -r 84d284e812cd -r d5220b220313 level1/atari/makefile
--- a/level1/atari/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/level1/atari/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -43,7 +43,7 @@
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
diff -r 84d284e812cd -r d5220b220313 level1/coco1/makefile
--- a/level1/coco1/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/level1/coco1/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -89,7 +89,7 @@
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
diff -r 84d284e812cd -r d5220b220313 level1/d64/makefile
--- a/level1/d64/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/level1/d64/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -123,7 +123,7 @@
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
diff -r 84d284e812cd -r d5220b220313 level1/dalpha/makefile
--- a/level1/dalpha/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/level1/dalpha/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -119,7 +119,7 @@
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
diff -r 84d284e812cd -r d5220b220313 level2/coco3/makefile
--- a/level2/coco3/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/level2/coco3/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -103,7 +103,7 @@
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
diff -r 84d284e812cd -r d5220b220313 level3/coco3/makefile
--- a/level3/coco3/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/level3/coco3/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -71,7 +71,7 @@
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
diff -r 84d284e812cd -r d5220b220313 level3/coco3_6309/makefile
--- a/level3/coco3_6309/makefile	Sat Jul 13 11:47:11 2013 +0200
+++ b/level3/coco3_6309/makefile	Sat Jul 13 11:53:36 2013 +0200
@@ -67,7 +67,7 @@
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(OS9COPY) $(DSKS) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
diff -r 84d284e812cd -r d5220b220313 rules.mak
--- a/rules.mak	Sat Jul 13 11:47:11 2013 +0200
+++ b/rules.mak	Sat Jul 13 11:53:36 2013 +0200
@@ -64,6 +64,7 @@
 MOVE		= mv
 ECHO		= echo
 CD		= cd
+CP		= cp
 OS9COPY		= os9 copy -o=0
 CPL		= $(OS9COPY) -l
 TAR		= tar