# HG changeset patch
# User Tormod Volden <debian.tormod@gmail.com>
# Date 1390034978 -3600
# Node ID aa31ba389777be786af6f57a1dac16a4b9827b10
# Parent  2b5ed6da67df1a445a16a6d14f3441871c4856b6
d64: Put DEFS folder on disk 2 for 180K 5.25" disk set

Otherwise disk 1 will be overfilled.

And put all commands on disk 1, now that there is enough
space.

At this point the build has no errors nor warnings!

diff -r 2b5ed6da67df -r aa31ba389777 level1/d64/cmds/makefile
--- a/level1/d64/cmds/makefile	Sat Jan 18 09:39:10 2014 +0100
+++ b/level1/d64/cmds/makefile	Sat Jan 18 09:49:38 2014 +0100
@@ -76,4 +76,4 @@
 	@$(ECHO) $(DRAGON525CMDS) $(SUBS)
 
 showdragon525objs2:
-	@$(ECHO) $(DRAGON525CMDS2) $(SUBS)
+	@$(ECHO) $(DRAGON525CMDS2)
diff -r 2b5ed6da67df -r aa31ba389777 level1/d64/makefile
--- a/level1/d64/makefile	Sat Jan 18 09:39:10 2014 +0100
+++ b/level1/d64/makefile	Sat Jan 18 09:49:38 2014 +0100
@@ -250,21 +250,22 @@
 	$(MAKDIR) $@,SYS
 	$(CD) cmds; $(OS9COPY) $(CMDS525) ../$@,CMDS
 	$(OS9ATTR_EXEC) $(foreach file,$(CMDS525),$@,CMDS/$(file))
+	# put all commands on the first disk because we can
+	$(CD) cmds; $(OS9COPY) $(CMDS525_2) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS525_2),$@,CMDS/$(file))
 	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
 	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYS),$@,SYS/$(file))
-	$(MAKDIR) $@,DEFS
-	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
-	$(OS9ATTR_TEXT) $(foreach file,$(DEFS),$@,DEFS/$(file))
 	$(CPL) $(ROOTFILES) $@,.
 	$(OS9ATTR_TEXT) $(foreach file,$(ROOTFILES),$@,$(file))
 
 $(DSK180K_2):
 	$(RM) $@
 	$(OS9FORMAT_SS40) -e -dr -q $@ -n"NitrOS-9/$(CPU) $(MACHINE) #2"
-	$(MAKDIR) $@,CMDS
-	$(CD) cmds; $(OS9COPY) $(CMDS525_2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS525_2),$@,CMDS/$(file))
+	# for space reasons, put the DEFS folder on the second disk
+	$(MAKDIR) $@,DEFS
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(OS9ATTR_TEXT) $(foreach file,$(DEFS),$@,DEFS/$(file))
 
 info:
 	@$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***"