- remove origin hack when installing sh.s and init.s

- build sh.s in src/cmd/mak

build/Makefile

@@ -109,6 +109,7 @@ unix usyms : $(KSRCS)
 	@mv a.out unix
 
 # build a prototype filesystems
+# XXX has hack to fix our orig hack in sh.s and init.s
 root usr protofs : $(ALLSRCS) init.0405 sh.0405
 	@echo Building filesystems...
 	@$(TREECOPY) ../fs/root .
@@ -116,7 +117,8 @@ root usr protofs : $(ALLSRCS) init.0405 sh.0405
 	@$(TREECOPY) ../fs/usr .
 	@$(TREECOPY) ../fs/new/usr .
 	@$(TREECOPY) ../src usr
-	@cp init.s sh.s usr/src/cmd
+	@sed '/40014/d' < sh.s > usr/src/cmd/sh.s
+	@sed '/40014/d' < init.s > usr/src/cmd/init.s
 	@cp $(KSRCS) usr/sys
 	@cp init.0405 root/etc/init
 	@cp sh.0405 root/bin/sh

src/cmd/mak

@@ -15,6 +15,7 @@ echo init.s; as init.s; mv a.out init
 echo ln.s; as ln.s; mv a.out ln
 echo login.s; as login.s; mv a.out login
 echo ls.s; as ls.s; mv a.out ls
+echo sh.s; as sh.s; mv a.out sh
 echo db; as db?.s; mv a.out db
 echo ld; as ld?.s; mv a.out ld
 echo as2; as as2?.s; mv a.out as2
@@ -30,4 +31,4 @@ echo ... install new "as" to build dc
 
 echo You can rm ':' acct ar cat chmod chown
 echo You can rm cmp date df dsw dusg fstrip getty
-echo You can rm init ln login ls as as2 db ld
+echo You can rm init ln login ls sh as as2 db ld