--- a/level2/makefile	Mon Apr 14 13:52:12 2003 +0000
+++ b/level2/makefile	Mon Apr 14 15:49:33 2003 +0000
@@ -1,8 +1,9 @@
 include ../Makefile.rules
 
 RELEASE		= os9l2v030101
-BOOTFILE	= bootfile_vdg
-KERNEL		= kernel_stock
+BOOTFILE	= BOOTFILES/bootfile_vdg
+KERNEL		= BOOTFILES/kernel_stock
+DIRS		= CMDS MODULES SYS BOOTFILES
 
 CMDS		= $(shell $(CD) CMDS; make showobjs)
 MODULES		= $(shell $(CD) MODULES; make showcopyobjs)
@@ -22,23 +23,14 @@
 all:
 	@$(ECHO) "*********************************************"
 	@$(ECHO) "*                                           *"
-	@$(ECHO) "*      OS-9 Level Two Vr3 Distribution      *"
-	@$(ECHO) "*        The Rumored Upgrade Version        *"
+	@$(ECHO) "*        OS-9 Level Two Distribution        *"
 	@$(ECHO) "*                                           *"
 	@$(ECHO) "*********************************************"
-	$(CD) CMDS; make
-	$(CD) MODULES; make
-	$(CD) DEFS; make
-	$(CD) SYS; make
-	$(CD) BOOTFILES; make
+	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
 
 # Clean all components
 clean: dskclean
-	-$(CD) CMDS; make clean
-	-$(CD) MODULES; make clean
-	-$(CD) DEFS; make clean
-	-$(CD) SYS; make clean
-	-$(CD) BOOTFILES; make clean
+	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
 	-$(RM) $(PACKAGENAME) $(DSK1) $(DSK2)
@@ -48,13 +40,13 @@
 dskcopy: dsk
 	$(CP) $(DSK1) $(DSK2) $(PACKAGENAME) $(DSKDIR)
 
-$(PACKAGENAME): $(DSK1) $(DSK2)
-	$(ARCHIVE) $(PACKAGENAME) $(DSK1) $(DSK2) ReadMe ChangeLog
+$(PACKAGENAME): $(DSK1) $(DSK2) ReadMe ChangeLog
+	$(ARCHIVE) $@ $^
 
 $(DSK1):
 	-$(RM) $@
 	$(OS9FORMAT_DS40) $@ -n"OS-9 Level Two System Disk"
-	$(OS9GEN) $@ -b=BOOTFILES/$(BOOTFILE) -t=BOOTFILES/$(KERNEL)
+	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNEL)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS