--- a/level1/cmds/makefile	Wed Jan 14 15:05:32 2004 +0000
+++ b/level1/cmds/makefile	Wed Jan 14 15:21:04 2004 +0000
@@ -10,7 +10,7 @@
 		display dmode dsave dump echo edit error exbin exmode format \
 		free grfo help ident iniz irqs link list load login makdir \
 		mdir merge mfree os9gen padrom park prompt printerr procs pwd pxd \
-		rename runb save setime shell shell_21 sleep \
+		rename runb save setime shellplus shell_21 sleep \
 		tee tmode touch tsmon tuneport unlink verify xmode
 SUBS		= gfx inkey syscall
 ALLOBJS		= $(CMDS) $(DRAGONCMDS) $(SUBS)
@@ -23,9 +23,6 @@
 pxd:	pd.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
 
-shell:	shellplus.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@
-
 clean:
 	$(RM) $(ALLOBJS)
 

--- a/level1/makefile	Wed Jan 14 15:05:32 2004 +0000
+++ b/level1/makefile	Wed Jan 14 15:21:04 2004 +0000
@@ -6,6 +6,10 @@
 KERNELFILE	= bootfiles/kernel_stock
 DIRS		= cmds modules defs sys bootfiles
 
+# Specify which shell should be used
+WHICHSHELL	= shellplus
+#WHICHSHELL	= shell_21
+
 CMDS		= $(shell $(CD) cmds; make showcocoobjs)
 BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
 KERNEL		= $(shell $(CD) modules; make showkernel)
@@ -58,6 +62,7 @@
 	$(MAKDIR) $@,SYS
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(MAKDIR) $@,DEFS
@@ -109,6 +114,7 @@
 	$(MAKDIR) $@,SYS
 	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(MAKDIR) $@,DEFS