--- a/level2/makefile	Fri Jan 17 21:04:02 2003 +0000
+++ b/level2/makefile	Fri Jan 17 21:10:01 2003 +0000
@@ -4,17 +4,17 @@
 BOOTFILE	= bootfile_vdg
 KERNEL		= kernel_stock
 
-CMDS            = $(shell $(CD) CMDS; make showobjs)
-MODULES         = $(shell $(CD) MODULES; make showcopyobjs)
-DEFS            = $(shell $(CD) DEFS; make showobjs)
-SYS             = $(shell $(CD) SYS; make showobjs)
+CMDS		= $(shell $(CD) CMDS; make showobjs)
+MODULES		= $(shell $(CD) MODULES; make showcopyobjs)
+DEFS		= $(shell $(CD) DEFS; make showobjs)
+SYSBIN		= $(shell $(CD) SYS; make showbinobjs)
+SYSTEXT		= $(shell $(CD) SYS; make showtextobjs)
 ROOTFILES	= startup upgrade_song
-SYSGO           = MODULES/cc3go
+SYSGO		= MODULES/cc3go
 
-PACKAGENAME     = $(RELEASE).zip
-DSK_SS40_1      = $(RELEASE)_ss40_1.dsk
-DSK_DS40_1      = $(RELEASE)_ds40_1.dsk
-DSK_DS40_2      = $(RELEASE)_ds40_2.dsk
+PACKAGENAME	= $(RELEASE).zip
+DSK_DS40_1	= $(RELEASE)_ds40_1.dsk
+DSK_DS40_2	= $(RELEASE)_ds40_2.dsk
 TESTDSK		= test.dsk
 
 
@@ -31,7 +31,6 @@
 	$(CD) DEFS; make
 	$(CD) SYS; make
 	$(CD) BOOTFILES; make
-	$(UNIX2OS9) $(ROOTFILES)
 	$(CHMOD) 644 $(ROOTFILES)
 
 # Clean all components
@@ -41,24 +40,14 @@
 	-$(CD) DEFS; make clean
 	-$(CD) SYS; make clean
 	-$(CD) BOOTFILES; make clean
-	-$(OS92UNIX) $(ROOTFILES)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK_SS40_1) $(DSK_DS40_1) $(DSK_DS40_2)
+	-$(RM) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2)
 
 dsk: all $(PACKAGENAME)
 
-$(PACKAGENAME): $(DSK_SS40_1) $(DSK_DS40_1) $(DSK_DS40_2)
-	$(ZIP) $(PACKAGENAME) $(DSK_SS40_1) $(DSK_DS40_1) $(DSK_DS40_2) ReadMe ChangeLog
-
-$(DSK_SS40_1):
-	-$(RM) $(DSK_SS40_1)
-	$(OS9FORMAT) $(DSK_SS40_1) -t40 -h1 -n"OS-9 Level Two System Disk"
-	$(OS9GEN) $(DSK_SS40_1) BOOTFILES/$(BOOTFILE) BOOTFILES/$(KERNEL)
-	$(MAKDIR) $(DSK_SS40_1),CMDS
-	$(CP) $(SYSGO) $(DSK_SS40_1),
-	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_SS40_1),CMDS
-	$(CP) $(ROOTFILES) $(DSK_SS40_1),.
+$(PACKAGENAME): $(DSK_DS40_1) $(DSK_DS40_2)
+	$(ZIP) $(PACKAGENAME) $(DSK_DS40_1) $(DSK_DS40_2) ReadMe ChangeLog
 
 $(DSK_DS40_1):
 	-$(RM) $(DSK_DS40_1)
@@ -69,12 +58,13 @@
 	$(MAKDIR) $(DSK_DS40_1),MODULES
 	$(CP) $(SYSGO) $(DSK_DS40_1),
 	$(CD) CMDS; $(CP) $(CMDS) ../$(DSK_DS40_1),CMDS
-	$(CD) SYS; $(CP) $(SYS) ../$(DSK_DS40_1),SYS
+	$(CD) SYS; $(CP) $(SYSBIN) ../$(DSK_DS40_1),SYS
+	$(CD) SYS; $(CPL) $(SYSTEXT) ../$(DSK_DS40_1),SYS
 	$(CD) MODULES; $(CP) $(MODULES) ../$(DSK_DS40_1),MODULES
-	$(CP) $(ROOTFILES) $(DSK_DS40_1),.
+	$(CPL) $(ROOTFILES) $(DSK_DS40_1),.
 
 $(DSK_DS40_2):
 	-$(RM) $(DSK_DS40_2)
 	$(OS9FORMAT) $(DSK_DS40_2) -t40 -h2 -n"OS-9 Level Two Development Disk"
 	$(MAKDIR) $(DSK_DS40_2),DEFS
-	$(CD) DEFS; $(CP) $(DEFS) ../$(DSK_DS40_2),DEFS
+	$(CD) DEFS; $(CPL) $(DEFS) ../$(DSK_DS40_2),DEFS