diff --git a/Makefile b/Makefile index 9604aa08..9cd162e9 100644 --- a/Makefile +++ b/Makefile @@ -35,15 +35,15 @@ DOC = info _info_ sysdoc sysnet syshst kshack _teco_ emacs emacs1 c kcc \ kldcp libdoc lisp _mail_ midas quux scheme manual wp chess ms macdoc \ aplogo _klfe_ pdp11 chsncp cbf rug bawden llogo eak clib teach pcnet \ combat pdl minits mits_s chaos hal -pics- imlac maint -BIN = sys1 sys2 emacs _teco_ lisp liblsp alan inquir sail comlap c decsys \ - graphs draw datdrw fonts fonts1 fonts2 games macsym maint imlac \ - _www_ gt40 llogo bawden sysbin -pics- lmman r +BIN = sys sys1 sys2 emacs _teco_ lisp liblsp alan inquir sail comlap \ + c decsys graphs draw datdrw fonts fonts1 fonts2 games macsym \ + maint imlac _www_ gt40 llogo bawden sysbin -pics- lmman r MINSRC = midas system $(DDT) $(SALV) $(KSFEDR) $(DUMP) # These are not included on the tape. DOCIGNORE=-e '\.(jpeg|pdf|info|md)$$' -e '^(dcg|github)$$' # These are on the minsys tape. -BINIGNORE=-e '^(ka10|ks10|sys)$$' +BINIGNORE=-e '^(ka10|ks10|minsys)$$' # These are on the minsrc tape. SRCIGNORE=-e '^(system|midas)$$' @@ -102,12 +102,12 @@ $(OUT)/minsrc.tape: $(ITSTAR) $(OUT)/minsys.tape: $(ITSTAR) $(OUT)/system $(MKDIR) $(OUT) $(ITSTAR) -cf $@ -C bin/ks10 _ sys - $(ITSTAR) -rf $@ -C bin sys + $(ITSTAR) -rf $@ -C bin/minsys sys $(OUT)/ka-minsys.tape: $(ITSTAR) $(OUT)/system $(MKDIR) $(OUT) $(ITSTAR) -cf $@ -C bin/ka10 _ sys - $(ITSTAR) -rf $@ -C bin sys + $(ITSTAR) -rf $@ -C bin/minsys sys $(OUT)/sources.tape: $(ITSTAR) build/$(EMULATOR)/stamp $(OUT)/syshst/$(H3TEXT) $(MKDIR) $(OUT) diff --git a/bin/sys/ts.ksfedr b/bin/ks10/sys/ts.ksfedr similarity index 100% rename from bin/sys/ts.ksfedr rename to bin/ks10/sys/ts.ksfedr diff --git a/bin/sys/atsign.ddt b/bin/minsys/sys/atsign.ddt similarity index 100% rename from bin/sys/atsign.ddt rename to bin/minsys/sys/atsign.ddt diff --git a/bin/sys/atsign.device b/bin/minsys/sys/atsign.device similarity index 100% rename from bin/sys/atsign.device rename to bin/minsys/sys/atsign.device diff --git a/bin/sys/atsign.hactrn b/bin/minsys/sys/atsign.hactrn similarity index 100% rename from bin/sys/atsign.hactrn rename to bin/minsys/sys/atsign.hactrn diff --git a/bin/sys/:msgs.times b/bin/minsys/sys/msgs.times similarity index 100% rename from bin/sys/:msgs.times rename to bin/minsys/sys/msgs.times diff --git a/bin/sys/ts.ddt b/bin/minsys/sys/ts.ddt similarity index 100% rename from bin/sys/ts.ddt rename to bin/minsys/sys/ts.ddt diff --git a/bin/sys/ts.lock b/bin/minsys/sys/ts.lock similarity index 100% rename from bin/sys/ts.lock rename to bin/minsys/sys/ts.lock diff --git a/bin/sys/ts.midas b/bin/minsys/sys/ts.midas similarity index 100% rename from bin/sys/ts.midas rename to bin/minsys/sys/ts.midas diff --git a/bin/sys/ts.pdset b/bin/minsys/sys/ts.pdset similarity index 100% rename from bin/sys/ts.pdset rename to bin/minsys/sys/ts.pdset