Mercurial > hg > Members > kono > nitros9-code

changeset 2749:7f7274884574

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated makefile(s) for spacequest1, spacequest2, subsim, mm, multivue, and rof so that becker disks, for use in DriveWire4 server, are created.
author drencor-xeen
date Wed, 09 Jan 2013 23:17:10 -0600
parents 1ff9d261b398
children 0e69fb47e053
files 3rdparty/packages/mm/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/rof/makefile 3rdparty/packages/sierra/spacequest1/makefile 3rdparty/packages/sierra/spacequest2/makefile 3rdparty/packages/subsim/makefile ChangeLog makefile
diffstat 8 files changed, 393 insertions(+), 129 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/mm/makefile	Wed Jan 09 18:20:39 2013 -0600
+++ b/3rdparty/packages/mm/makefile	Wed Jan 09 23:17:10 2013 -0600
@@ -4,15 +4,19 @@
 
 DSK_FLOPPY	= mm.dsk
 DSK_DW3		= mm_dw3.dsk
+DSK_DW3_BECKER	= mm_dw3_becker.dsk
+
 CMDS		= mm mod1.dat mod2.dat mod3.dat mod4.dat mod5.dat \
 		mod6.sbr mod7.sbr mod8.sbr
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -29,6 +33,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
 
+BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+
 SUPPORTFILES	= global.dat mm.lib mm.pnl mm.ttl mod7.lib
 
 ALLOBJS		= $(CMDS)
@@ -74,6 +86,23 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)
 
+$(DSK_DW3_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS80) -q $@ -n"Microscopic Mission"
+	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/mm AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)
+
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
 
--- a/3rdparty/packages/multivue/makefile	Wed Jan 09 18:20:39 2013 -0600
+++ b/3rdparty/packages/multivue/makefile	Wed Jan 09 23:17:10 2013 -0600
@@ -4,6 +4,9 @@
 DSK63_FLOPPY	= multivue_6309.dsk
 DSK68_DW3	= multivue_6809_dw3.dsk
 DSK63_DW3	= multivue_6309_dw3.dsk
+DSK68_DW3_BECKER	= multivue_6809_dw3_becker.dsk
+DSK63_DW3_BECKER	= multivue_6309_dw3_becker.dsk
+
 CMDS68	= $(shell $(CD) cmds_6809; make --no-print-directory showobjs)
 CMDS63	= $(shell $(CD) cmds_6309; make --no-print-directory showobjs)
 ICONS	= icon.demo
@@ -12,7 +15,7 @@
 DEMO	= aif.dmo
 ROOTFILES = startup
 
-DSKS	= $(DSK68_FLOPPY) $(DSK63_FLOPPY) $(DSK68_DW3) $(DSK63_DW3)
+DSKS	= $(DSK68_FLOPPY) $(DSK63_FLOPPY) $(DSK68_DW3) $(DSK63_DW3) $(DSK68_DW3_BECKER) $(DSK63_DW3_BECKER)
 
 MD68	= $(LEVEL2)/coco3/modules
 MD63	= $(LEVEL2)/coco3_6309/modules
@@ -21,6 +24,8 @@
 KERNEL63_FLOPPY	= $(MD63)/rel_40 $(MD63)/boot_1773_6ms $(MD63)/krn
 KERNEL68_DW3	= $(MD68)/rel_40 $(MD68)/boot_dw3 $(MD68)/krn
 KERNEL63_DW3	= $(MD63)/rel_40 $(MD63)/boot_dw3 $(MD63)/krn
+KERNEL68_DW3_BECKER	= $(MD68)/rel_40 $(MD68)/boot_dw3_becker $(MD68)/krn
+KERNEL63_DW3_BECKER	= $(MD63)/rel_40 $(MD63)/boot_dw3_becker $(MD63)/krn
 
 BOOTFILE68_FLOPPY	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
 		$(MD68)/rbf.mn \
@@ -58,6 +63,18 @@
 		$(MD68)/clock_60hz $(MD68)/clock2_dw3 \
 		$(MD68)/sysgo_dd
 
+BOOTFILE68_DW3_BECKER	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
+		$(MD68)/rbf.mn \
+		$(MD68)/rbdw3.dr $(MD68)/dw3_becker.sb $(MD68)/ddx0.dd \
+		$(MD68)/rb1773.dr $(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
+		$(MD68)/scf.mn $(MD68)/vtio.dr \
+		$(MD68)/keydrv_cc3.sb $(MD68)/joydrv_joy.sb $(MD68)/snddrv_cc3.sb \
+		$(MD68)/cowin.io $(MD68)/term_win40.dt \
+		$(MD68)/w.dw $(MD68)/w1.dw $(MD68)/w2.dw $(MD68)/w3.dw \
+		$(MD68)/w4.dw $(MD68)/w5.dw $(MD68)/w6.dw $(MD68)/w7.dw \
+		$(MD68)/clock_60hz $(MD68)/clock2_dw3 \
+		$(MD68)/sysgo_dd
+
 BOOTFILE63_DW3	= $(MD63)/krnp2 $(MD63)/ioman $(MD63)/init \
 		$(MD63)/rbf.mn \
 		$(MD63)/rbdw3.dr $(MD63)/dw3.sb $(MD63)/ddx0.dd \
@@ -70,6 +87,18 @@
 		$(MD63)/clock_60hz $(MD63)/clock2_dw3 \
 		$(MD63)/sysgo_dd
 
+BOOTFILE63_DW3_BECKER	= $(MD63)/krnp2 $(MD63)/ioman $(MD63)/init \
+		$(MD63)/rbf.mn \
+		$(MD63)/rbdw3.dr $(MD63)/dw3_becker.sb $(MD63)/ddx0.dd \
+		$(MD68)/rb1773.dr $(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
+		$(MD63)/scf.mn $(MD63)/vtio.dr \
+		$(MD63)/keydrv_cc3.sb $(MD63)/joydrv_joy.sb $(MD63)/snddrv_cc3.sb \
+		$(MD63)/cowin.io $(MD63)/term_win40.dt \
+		$(MD63)/w.dw $(MD63)/w1.dw $(MD63)/w2.dw $(MD63)/w3.dw \
+		$(MD63)/w4.dw $(MD63)/w5.dw $(MD63)/w6.dw $(MD63)/w7.dw \
+		$(MD63)/clock_60hz $(MD63)/clock2_dw3 \
+		$(MD63)/sysgo_dd
+
 # Make all components
 all:
 	@$(ECHO) "**************************************************"
@@ -164,6 +193,31 @@
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
+$(DSK68_DW3_BECKER):
+	$(RM) $@
+	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
+	$(MERGE) $(BOOTFILE68_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL68_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,CMDS/ICONS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEMO
+	$(CD) cmds_6809; $(CP) $(CMDS68) ../$@,CMDS
+	$(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
+	$(OS9RENAME) $@,CMDS/gshell AutoEx
+	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
+	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) demo; $(CPL) $(DEMO) ../$@,DEMO
+	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $@,DEMO/$(file);)
+	$(CPL) $(ROOTFILES) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
 $(DSK63_DW3):
 	$(RM) $@
 	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
@@ -189,6 +243,31 @@
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
+$(DSK63_DW3_BECKER):
+	$(RM) $@
+	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
+	$(MERGE) $(BOOTFILE63_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL63_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,CMDS/ICONS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEMO
+	$(CD) cmds_6309; $(CP) $(CMDS63) ../$@,CMDS
+	$(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
+	$(OS9RENAME) $@,CMDS/gshell AutoEx
+	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
+	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) demo; $(CPL) $(DEMO) ../$@,DEMO
+	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $@,DEMO/$(file);)
+	$(CPL) $(ROOTFILES) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
 
--- a/3rdparty/packages/rof/makefile	Wed Jan 09 18:20:39 2013 -0600
+++ b/3rdparty/packages/rof/makefile	Wed Jan 09 23:17:10 2013 -0600
@@ -4,14 +4,18 @@
 
 DSK_FLOPPY	= rof.dsk
 DSK_DW3		= rof_dw3.dsk
+DSK_DW3_BECKER	= rof_dw3_becker.dsk
+
 CMDS		= rescue
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -28,6 +32,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
 
+BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+
 SUPPORTFILES	= body heads larms legs lips panel1 rofvar rship.c rtitle.c scores
 
 ALLOBJS		= $(CMDS)
@@ -73,6 +85,23 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
+$(DSK_DW3_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS35) -q $@ -n"Rescue on Fractalus"
+	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/rescue AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
 
--- a/3rdparty/packages/sierra/spacequest1/makefile	Wed Jan 09 18:20:39 2013 -0600
+++ b/3rdparty/packages/sierra/spacequest1/makefile	Wed Jan 09 23:17:10 2013 -0600
@@ -11,8 +11,9 @@
 DISK_2_40D	= spacequest1_d2_40d.dsk
 DISK_80D	= spacequest1_80d.dsk
 DISK_DW3	= spacequest1_dw3.dsk
+DISK_DW3_BECKER	= spacequest1_dw3_becker.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DISK_DW3)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DISK_DW3) $(DISK_DW3_BECKER)
 
 DISK_1_40D_NAME	= "Space Quest I Disk 1"
 DISK_2_40D_NAME	= "Space Quest I Disk 2"
@@ -24,7 +25,9 @@
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3		= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -43,7 +46,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -52,6 +55,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
 
+OS9BOOT_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -74,78 +86,104 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk_40d:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D)
+$(DISK_1_40D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(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
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
+	$(MERGE) $(OS9BOOT_40D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_40D),CMDS
+	$(CP) shell $@,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
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
 	$(MOVE) tocgen toctmp
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
+	$(CP) $(SUPPORTFILES_D1) $@,.
 
-dsk_80d:	all
-	$(RM) $(DISK_80D)
+$(DISK_2_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_80D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_80D),CMDS
+	$(CP) shell $@,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
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
 	$(MOVE) tocgen toctmp
-	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $(DISK_80D),.
+	$(CP) $(SUPPORTFILES) $@,.
 
-dsk_dw3:	all
-	$(RM) $(DISK_DW3)
+$(DISK_DW3):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3)>os9boot_dw3
-	$(MERGE) $(KERNEL_DW3)>kernel_dw3
-	$(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3
-	$(RM) os9boot_dw3 kernel_dw3
-	$(MAKDIR) $(DISK_DW3),CMDS
-	$(CP) $(CMDS) $(DISK_DW3),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);)
+	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
+	$(MERGE) $(OS9BOOT_DW3)>os9boot
+	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_DW3),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_DW3),.
-	$(OS9RENAME) $(DISK_DW3),tOC_80d.txt tOC.txt
-	$(RM) tocgen
-	tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC
-	$(CP) $(SUPPORTFILES) $(DISK_DW3),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.
 
+$(DISK_DW3_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
+	$(MERGE) $(OS9BOOT_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) 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
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.
 
-dsk:	dsk_40d dsk_80d dsk_dw3
+dsk:	all $(DSKS)
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/spacequest2/makefile	Wed Jan 09 18:20:39 2013 -0600
+++ b/3rdparty/packages/sierra/spacequest2/makefile	Wed Jan 09 23:17:10 2013 -0600
@@ -12,8 +12,9 @@
 DISK_3_40D	= spacequest2_d3_40d.dsk
 DISK_80D	= spacequest2_80d.dsk
 DISK_DW3	= spacequest3_dw3.dsk
+DISK_DW3_BECKER	= spacequest3_dw3_becker.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DISK_DW3)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DISK_DW3) $(DISK_DW3_BECKER)
 
 DISK_1_40D_NAME = "Space Quest II Disk 1"
 DISK_2_40D_NAME = "Space Quest II Disk 2"
@@ -26,7 +27,9 @@
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3		= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -45,7 +48,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -54,6 +57,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
 
+OS9BOOT_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -78,80 +90,109 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk_40d:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
+$(DISK_1_40D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
+	$(MERGE) $(OS9BOOT_40D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_40D),CMDS
+	$(CP) shell $@,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),.
+	$(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) $@,.
 	$(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),.
-	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
-
-dsk_80d:	all
-	$(RM) $(DISK_80D)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_80D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
-	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) 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),.
-	$(MOVE) tocgen toctmp
-	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw3:	all
-	$(RM) $(DISK_DW3)
+$(DISK_2_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_3_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
+	$(CP) $(SUPPORTFILES_D3) $@,.
+
+$(DISK_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $(DISK_DW3) -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3)>os9boot_dw3
-	$(MERGE) $(KERNEL_DW3)>kernel_dw3
-	$(OS9GEN) $(DISK_DW3) -b=os9boot_dw3 -t=kernel_dw3
-	$(RM) os9boot_dw3 kernel_dw3
-	$(MAKDIR) $(DISK_DW3),CMDS
-	$(CP) $(CMDS) $(DISK_DW3),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW3),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_DW3),CMDS
+	$(CP) 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) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_DW3):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
+	$(MERGE) $(OS9BOOT_DW3)>os9boot
+	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_DW3),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_DW3),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_DW3),.
-	$(OS9RENAME) $(DISK_DW3),tOC_80d.txt tOC.txt
-	$(RM) tocgen
-	tocgen $(DISK_DW3),tOC.txt $(DISK_DW3),tOC
-	$(CP) $(SUPPORTFILES) $(DISK_DW3),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.
 
+$(DISK_DW3_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
+	$(MERGE) $(OS9BOOT_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) 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
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.
 
-dsk:	dsk_40d dsk_80d dsk_dw3
+dsk:	all $(DSKS)
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/subsim/makefile	Wed Jan 09 18:20:39 2013 -0600
+++ b/3rdparty/packages/subsim/makefile	Wed Jan 09 23:17:10 2013 -0600
@@ -4,14 +4,18 @@
 
 DSK_FLOPPY	= subsim.dsk
 DSK_DW3		= subsim_dw3.dsk
+DSK_DW3_BECKER	= subsim_dw3_becker.dsk
+
 CMDS		= presub sub sub1 sub2 sub3 sub4 sub5 sub6
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -28,6 +32,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
 
+BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+
 SUPPORTFILES	= control1.cmp convoys.dat diesel.dat fonts.dat germap.cmp \
 		hiscore.dat mission.txt missions.dat radar.dat shipmap2.dat \
 		sintbl.dat stitle.pic sub.dat usamap.cmp status.dat substats.dat 
@@ -79,6 +91,25 @@
 	$(OS9ATTR_EXEC) $@,SUB/sub6
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
 
+$(DSK_DW3_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS80) $@ -n"Sub Battle Simulator"
+	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS $@,SUB
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(OS9RENAME) $@,CMDS/presub AutoEx
+	$(CP) $(SUPPORTFILES) $@,SUB
+	$(CP) sub6 $@,SUB
+	$(OS9ATTR_EXEC) $@,SUB/sub6
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
+
 dskcopy:
 	$(CP) $(DSKS) $(DSKDIR)
 
--- a/ChangeLog	Wed Jan 09 18:20:39 2013 -0600
+++ b/ChangeLog	Wed Jan 09 23:17:10 2013 -0600
@@ -1,6 +1,21 @@
 NitrOS-9 V3.2.9:
 
 ----------------------------------------------------------
+2013/01/10 David Ladd
+M ChangeLog
+M makefile
+M 3rdparty/packages/sierra/spacequest1/makefile
+M 3rdparty/packages/sierra/spacequest2/makefile
+M 3rdparty/packages/subsim/makefile
+M 3rdparty/packages/mm/makefile
+M 3rdparty/packages/multivue/makefile
+M 3rdparty/packages/rof/makefile
+
+Updated makefile(s) for spacequest1, spacequest2, subsim, mm, multivue,
+and rof so that becker boot disks, for use in drivewire4, are created.
+
+
+----------------------------------------------------------
 2013/01/09 David Ladd
 M ChangeLog
 M 3rdparty/packages/fsim2/makefile
--- a/makefile	Wed Jan 09 18:20:39 2013 -0600
+++ b/makefile	Wed Jan 09 23:17:10 2013 -0600
@@ -13,8 +13,10 @@
 
 # Clean all components
 clean:
-	-$(RM) nitros9project.zip dsks/*.dsk
+	-$(RM) nitros9project.zip $(DSKDIR)/*.dsk $(DSKDIR)/ReadMe $(DSKDIR)/index.shtml
 	$(foreach dir, $(dirs), ($(CD) $(dir); make clean);)
+	$(RM) $(DSKDIR)/ReadMe
+	$(RM) $(DSKDIR)/index.html
 
 # Do CVS update
 hgupdate:
@@ -46,8 +48,8 @@
 	@$(foreach dir, $(dirs), ($(CD) $(dir); make info);)
 	
 nightly: clean hgupdate dskcopy
-	make info>dsks/ReadMe
-	$(ARCHIVE) nitros9project dsks/*
+	make info>$(DSKDIR)/ReadMe
+	$(ARCHIVE) nitros9project $(DSKDIR)/*
 	scp nitros9project.zip $(SOURCEUSER),nitros9@web.sourceforge.net:/home/groups/n/ni/nitros9/htdocs
 	ssh $(SOURCEUSER),nitros9@shell.sourceforge.net create
 	ssh $(SOURCEUSER),nitros9@shell.sourceforge.net "./burst"