Mercurial > hg > Members > kono > nitros9-code

changeset 2758:e4a0f58a5f9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Found that people who do not have the envirornment variable NITROS9DIR set before building the project get a error missing file "/rules.mak". Found this is caused do to the fact that the code to set this envirornment variable is in the rules.mak which can't get loaded. To fix this the code needed to set the envirornment variable that is in the rules.mak is now in the makefile(s) right before the include for the rules.mak file. This should fix the problem for those who do not have the NITROS9DIR envirornment variable preset.
author drencor-xeen
date Mon, 14 Jan 2013 14:37:46 -0600
parents 8888cd0cac1a
children e26e3b45ff86
files 3rdparty/booters/makefile 3rdparty/customboots/boisy/makefile 3rdparty/drivers/burke/makefile 3rdparty/drivers/disto/makefile 3rdparty/drivers/emudsk/makefile 3rdparty/drivers/ide/makefile 3rdparty/drivers/makefile 3rdparty/drivers/mmc/makefile 3rdparty/drivers/s16550/makefile 3rdparty/drivers/sdisk/makefile 3rdparty/drivers/sdisk3/makefile 3rdparty/drivers/tccc/makefile 3rdparty/fmgrs/makefile 3rdparty/fmgrs/msf/makefile 3rdparty/makefile 3rdparty/p2mods/makefile 3rdparty/p2mods/noice/makefile 3rdparty/packages/arcadepak/makefile 3rdparty/packages/basic09/makefile 3rdparty/packages/cc/makefile 3rdparty/packages/coyota/makefile 3rdparty/packages/deskmate3/makefile 3rdparty/packages/ed/makefile 3rdparty/packages/fsim2/makefile 3rdparty/packages/koronis/makefile 3rdparty/packages/kyumgai/makefile 3rdparty/packages/makefile 3rdparty/packages/mm/makefile 3rdparty/packages/multivue/cmds_6309/makefile 3rdparty/packages/multivue/cmds_6809/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/os9l2bbs/6809l2/makefile 3rdparty/packages/os9l2bbs/makefile 3rdparty/packages/pacos9/makefile 3rdparty/packages/raakatu/makefile 3rdparty/packages/rof/makefile 3rdparty/packages/sierra/makefile 3rdparty/packages/subsim/makefile 3rdparty/packages/uemacs/makefile 3rdparty/packages/uucpbb/cmds_6309/makefile 3rdparty/packages/uucpbb/cmds_6809/makefile 3rdparty/packages/uucpbb/makefile 3rdparty/packages/uucpbb/src/makefile 3rdparty/subrtns/makefile 3rdparty/utils/boisy/makefile 3rdparty/utils/dasm/makefile 3rdparty/utils/makefile 3rdparty/utils/smartwatch/makefile 3rdparty/utils/supercomm/makefile 3rdparty/utils/view/makefile 3rdparty/utils/winfo/makefile ChangeLog bootman/makefile level1/atari/bootfiles/makefile level1/atari/cmds/makefile level1/atari/defs/makefile level1/atari/makefile level1/atari/modules/kernel/makefile level1/atari/modules/makefile level1/atari/sys/makefile level1/cmds/makefile level1/coco/bootfiles/makefile level1/coco/bootroms/makefile level1/coco/cmds/makefile level1/coco/defs/makefile level1/coco/makefile level1/coco/modules/kernel/makefile level1/coco/modules/makefile level1/coco/sys/makefile level1/d64/bootfiles/makefile level1/d64/cmds/makefile level1/d64/defs/makefile level1/d64/makefile level1/d64/modules/kernel/makefile level1/d64/modules/makefile level1/d64/sys/makefile level1/dalpha/bootfiles/makefile level1/dalpha/cmds/makefile level1/dalpha/defs/makefile level1/dalpha/makefile level1/dalpha/modules/kernel/makefile level1/dalpha/modules/makefile level1/dalpha/sys/makefile level1/makefile level1/tano/bootfiles/makefile level1/tano/cmds/makefile level1/tano/defs/makefile level1/tano/makefile level1/tano/modules/kernel/makefile level1/tano/modules/makefile level1/tano/sys/makefile level2/coco3/bootfiles/makefile level2/coco3/bootroms/makefile level2/coco3/cmds/makefile level2/coco3/defs/makefile level2/coco3/makefile_common level2/coco3/modules/kernel/makefile level2/coco3/modules/makefile level2/coco3/sys/makefile level2/coco3_6309/bootfiles/makefile level2/coco3_6309/bootroms/makefile level2/coco3_6309/defs/makefile level2/coco3_6309/modules/kernel/makefile level2/makefile level2/sys/makefile level3/coco3/bootfiles/makefile level3/coco3/cmds/makefile level3/coco3/defs/makefile level3/coco3/makefile level3/coco3/modules/kernel/makefile level3/coco3/modules/makefile level3/coco3/sys/makefile level3/coco3_6309/bootfiles/makefile level3/coco3_6309/cmds/makefile level3/coco3_6309/defs/makefile level3/coco3_6309/makefile level3/coco3_6309/modules/kernel/makefile level3/coco3_6309/modules/makefile level3/coco3_6309/sys/makefile lib/alib/makefile lib/makefile makefile rules.mak
diffstat 123 files changed, 543 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/booters/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/booters/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 BOOTERS_L2	= boot_vhd boot_mmc_l2
--- a/3rdparty/customboots/boisy/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/customboots/boisy/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,6 +1,9 @@
 # NitrOS-9/6809 Level 2 bootfile for a 128K CoCo 3 with a Motorla 6809
 # For Boisy's thesis work
 
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../../../utils/boisy:..:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(LEVEL1)/modules:$(NITROS9DIR)/3rdparty/packages/basic09
--- a/3rdparty/drivers/burke/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/burke/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 DRVRS		= bb1fhdisk.dr bb1hd.dr bb1hdisk.dr bb1th.dr bb1thdisk.dr \
--- a/3rdparty/drivers/disto/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/disto/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL2)/modules:$(LEVEL1)/modules
 
--- a/3rdparty/drivers/emudsk/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/emudsk/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/drivers/ide/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/ide/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,6 +1,9 @@
 # Curtis Boyle's IDE Driver
 
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 DRVRS		= ccide_l1.dr ccide_l2.dr
--- a/3rdparty/drivers/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 dirs	= burke disto emudsk ide mmc s16550 sdisk sdisk3 tccc
 
--- a/3rdparty/drivers/mmc/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/mmc/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,6 +1,9 @@
 # Jim Hathaway's MultiMediaCard NitrOS-9 driver
 
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 DRVRS		= mmcdrv_l1.dr mmcdrv_l2.dr mmcdrv_l1s.dr mmcdrv_l2s.dr 
--- a/3rdparty/drivers/s16550/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/s16550/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/drivers/sdisk/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/sdisk/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/drivers/sdisk3/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/sdisk3/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/drivers/tccc/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/drivers/tccc/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 DRVRS		= tccchd.dr
--- a/3rdparty/fmgrs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/fmgrs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 dirs	= msf
 
--- a/3rdparty/fmgrs/msf/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/fmgrs/msf/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,7 +1,10 @@
 # MSF file manager
 #
 
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= booters drivers fmgrs p2mods subrtns utils packages
--- a/3rdparty/p2mods/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/p2mods/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 CMDS		= os9p3_sayhi sayhi tsayhi datmod tdatmod
--- a/3rdparty/p2mods/noice/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/p2mods/noice/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 AFLAGS		+= #-ASWI
--- a/3rdparty/packages/arcadepak/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/arcadepak/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 6809L2		= $(NITROS9DIR)/level2/coco3
--- a/3rdparty/packages/basic09/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/basic09/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DISK	= basic09v010100.dsk
--- a/3rdparty/packages/cc/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/cc/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DISK		= cc.dsk
 CMDS		= cc1 c.prep c.pass1 c.pass2 c.opt c.asm c.link make
--- a/3rdparty/packages/coyota/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/coyota/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 TARGET	= coyota
--- a/3rdparty/packages/deskmate3/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/deskmate3/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DISK	= deskmate3.dsk
--- a/3rdparty/packages/ed/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/ed/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CFLAGS += -y -q
--- a/3rdparty/packages/fsim2/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/fsim2/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/koronis/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/koronis/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/kyumgai/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/kyumgai/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= arcadepak basic09 deskmate3 cc fsim2 koronis kyumgai mm multivue pacos9 rof sierra subsim uucpbb
--- a/3rdparty/packages/mm/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/mm/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/multivue/cmds_6309/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/multivue/cmds_6309/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../cmds_6809
--- a/3rdparty/packages/multivue/cmds_6809/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/multivue/cmds_6809/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/multivue/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/multivue/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DSK68_FLOPPY	= multivue_6809.dsk
--- a/3rdparty/packages/os9l2bbs/6809l2/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/os9l2bbs/6809l2/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../cmds
--- a/3rdparty/packages/os9l2bbs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/os9l2bbs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	=  6809l2
--- a/3rdparty/packages/pacos9/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/pacos9/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 RFILES	= main90.r board90.r caged90.r check90.r ghosts90.r movpac90.r \
--- a/3rdparty/packages/raakatu/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/raakatu/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/rof/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/rof/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/sierra/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/sierra/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= blackcauldron christmas86 goldrush \
--- a/3rdparty/packages/subsim/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/subsim/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/uemacs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/uemacs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,5 +1,8 @@
 #  makefile for Micro emacs for os9/68000
 # temp files on ram disk
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CC	= c3
@@ -22,4 +25,4 @@
 $(RESTR): ueed.h
 
 clean:
-	$(RM) $(RFILES) umacs
\ No newline at end of file
+	$(RM) $(RFILES) umacs
--- a/3rdparty/packages/uucpbb/cmds_6309/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/uucpbb/cmds_6309/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/uucpbb/cmds_6809/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/uucpbb/cmds_6809/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/uucpbb/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/uucpbb/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DISK68	= uucpbb21_6809.dsk
 DISK63	= uucpbb21_6309.dsk
--- a/3rdparty/packages/uucpbb/src/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/packages/uucpbb/src/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # makefile for OS-9 UUCP package, UUCPbb v2.1 (OS-9/6809)
--- a/3rdparty/subrtns/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/subrtns/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/boisy/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/utils/boisy/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,7 +1,10 @@
 # OS-9 Commands/Utilities
 #
 
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/dasm/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/utils/dasm/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/utils/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 dirs	= boisy dasm smartwatch supercomm winfo
 
--- a/3rdparty/utils/smartwatch/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/utils/smartwatch/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/supercomm/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/utils/supercomm/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/view/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/utils/view/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 TARGET	= view
@@ -17,4 +20,4 @@
 	rlink $(LFLAGS) $(ROFS) -o=$(TARGET)
 	
 clean:
-	$(RM) $(TARGET) $(ROFS)
\ No newline at end of file
+	$(RM) $(TARGET) $(ROFS)
--- a/3rdparty/utils/winfo/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/3rdparty/utils/winfo/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
 
--- a/ChangeLog	Sat Jan 12 20:52:19 2013 -0600
+++ b/ChangeLog	Mon Jan 14 14:37:46 2013 -0600
@@ -1,6 +1,144 @@
 NitrOS-9 V3.2.9:
 
 ----------------------------------------------------------
+2013/01/14 David Ladd
+M ChangeLog
+M 3rdparty/booters/makefile
+M 3rdparty/customboots/boisy/makefile
+M 3rdparty/drivers/burke/makefile
+M 3rdparty/drivers/disto/makefile
+M 3rdparty/drivers/emudsk/makefile
+M 3rdparty/drivers/ide/makefile
+M 3rdparty/drivers/makefile
+M 3rdparty/drivers/mmc/makefile
+M 3rdparty/drivers/s16550/makefile
+M 3rdparty/drivers/sdisk/makefile
+M 3rdparty/drivers/sdisk3/makefile
+M 3rdparty/drivers/tccc/makefile
+M 3rdparty/fmgrs/makefile
+M 3rdparty/fmgrs/msf/makefile
+M 3rdparty/makefile
+M 3rdparty/p2mods/makefile
+M 3rdparty/p2mods/noice/makefile
+M 3rdparty/packages/arcadepak/makefile
+M 3rdparty/packages/basic09/makefile
+M 3rdparty/packages/cc/makefile
+M 3rdparty/packages/coyota/makefile
+M 3rdparty/packages/deskmate3/makefile
+M 3rdparty/packages/ed/makefile
+M 3rdparty/packages/fsim2/makefile
+M 3rdparty/packages/koronis/makefile
+M 3rdparty/packages/kyumgai/makefile
+M 3rdparty/packages/makefile
+M 3rdparty/packages/mm/makefile
+M 3rdparty/packages/multivue/cmds_6309/makefile
+M 3rdparty/packages/multivue/cmds_6809/makefile
+M 3rdparty/packages/multivue/makefile
+M 3rdparty/packages/os9l2bbs/6809l2/makefile
+M 3rdparty/packages/os9l2bbs/makefile
+M 3rdparty/packages/pacos9/makefile
+M 3rdparty/packages/raakatu/makefile
+M 3rdparty/packages/rof/makefile
+M 3rdparty/packages/sierra/makefile
+M 3rdparty/packages/subsim/makefile
+M 3rdparty/packages/uemacs/makefile
+M 3rdparty/packages/uucpbb/cmds_6309/makefile
+M 3rdparty/packages/uucpbb/cmds_6809/makefile
+M 3rdparty/packages/uucpbb/makefile
+M 3rdparty/packages/uucpbb/src/makefile
+M 3rdparty/subrtns/makefile
+M 3rdparty/utils/boisy/makefile
+M 3rdparty/utils/dasm/makefile
+M 3rdparty/utils/makefile
+M 3rdparty/utils/smartwatch/makefile
+M 3rdparty/utils/supercomm/makefile
+M 3rdparty/utils/view/makefile
+M 3rdparty/utils/winfo/makefile
+M bootman/makefile
+M level1/atari/bootfiles/makefile
+M level1/atari/cmds/makefile
+M level1/atari/defs/makefile
+M level1/atari/makefile
+M level1/atari/modules/kernel/makefile
+M level1/atari/modules/makefile
+M level1/atari/sys/makefile
+M level1/cmds/makefile
+M level1/coco/bootfiles/makefile
+M level1/coco/bootroms/makefile
+M level1/coco/cmds/makefile
+M level1/coco/defs/makefile
+M level1/coco/makefile
+M level1/coco/modules/kernel/makefile
+M level1/coco/modules/makefile
+M level1/coco/sys/makefile
+M level1/d64/bootfiles/makefile
+M level1/d64/cmds/makefile
+M level1/d64/defs/makefile
+M level1/d64/makefile
+M level1/d64/modules/kernel/makefile
+M level1/d64/modules/makefile
+M level1/d64/sys/makefile
+M level1/dalpha/bootfiles/makefile
+M level1/dalpha/cmds/makefile
+M level1/dalpha/defs/makefile
+M level1/dalpha/makefile
+M level1/dalpha/modules/kernel/makefile
+M level1/dalpha/modules/makefile
+M level1/dalpha/sys/makefile
+M level1/makefile
+M level1/tano/bootfiles/makefile
+M level1/tano/cmds/makefile
+M level1/tano/defs/makefile
+M level1/tano/makefile
+M level1/tano/modules/kernel/makefile
+M level1/tano/modules/makefile
+M level1/tano/sys/makefile
+M level2/coco3/bootfiles/makefile
+M level2/coco3/bootroms/makefile
+M level2/coco3/cmds/makefile
+M level2/coco3/defs/makefile
+M level2/coco3/makefile_common
+M level2/coco3/modules/kernel/makefile
+M level2/coco3/modules/makefile
+M level2/coco3/sys/makefile
+M level2/coco3_6309/bootfiles/makefile
+M level2/coco3_6309/bootroms/makefile
+M level2/coco3_6309/defs/makefile
+M level2/coco3_6309/modules/kernel/makefile
+M level2/makefile
+M level2/sys/makefile
+M level3/coco3/bootfiles/makefile
+M level3/coco3/cmds/makefile
+M level3/coco3/defs/makefile
+M level3/coco3/makefile
+M level3/coco3/modules/kernel/makefile
+M level3/coco3/modules/makefile
+M level3/coco3/sys/makefile
+M level3/coco3_6309/bootfiles/makefile
+M level3/coco3_6309/cmds/makefile
+M level3/coco3_6309/defs/makefile
+M level3/coco3_6309/makefile
+M level3/coco3_6309/modules/kernel/makefile
+M level3/coco3_6309/modules/makefile
+M level3/coco3_6309/sys/makefile
+M lib/alib/makefile
+M lib/makefile
+M makefile
+M rules.mak
+
+Updated makefiles to fix for incorrectly not finding the rules.mak file.
+When running make without the envirornment variable "NITROS9DIR" being set
+you would get error's when building the project that "/rules.mak" could not
+be found.
+This is because the code to set the envirornment variable "NITROS9DIR" is in
+the rules.mak which can not be included because of the envirornment variable
+not being set. To fix this I put the code needed to set this envirornment
+variable before each include for the rules.mak.
+
+This change should not effect people who already have this envirornment
+variable set before building the project.
+
+----------------------------------------------------------
 2013/01/12 David Ladd
 M ChangeLog
 M makefile
--- a/bootman/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/bootman/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
-include ../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 all: bootman_coco_6551 bootman_coco3_6551 #bootman_loader
 
--- a/level1/atari/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/atari/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = atari
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/atari/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/atari/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = atari
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.a $(LEVEL1)/cmds
--- a/level1/atari/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/atari/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/atari/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/atari/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = atari
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/atari/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/atari/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/atari/modules/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/atari/modules/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = atari
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/atari/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/atari/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,5 +1,8 @@
 PORT = 
-include ../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(3RDPARTY)/packages/basic09
 
--- a/level1/coco/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/coco/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/coco/bootroms/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/coco/bootroms/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/coco/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/coco/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.a $(LEVEL1)/cmds
--- a/level1/coco/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/coco/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/coco/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/coco/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/coco/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/coco/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/coco/modules/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/coco/modules/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/coco/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/coco/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/d64/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/d64/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -18,6 +18,9 @@
 #
 
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/d64/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/d64/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
--- a/level1/d64/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/d64/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/d64/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/d64/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -30,6 +30,9 @@
 #
 
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR     = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/d64/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/d64/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/d64/modules/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/d64/modules/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -21,6 +21,9 @@
 #
 
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/d64/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/d64/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR     = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/dalpha/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/dalpha/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -18,6 +18,9 @@
 #
 
 PORT = dalpha
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/dalpha/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/dalpha/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = dalpha
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
--- a/level1/dalpha/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/dalpha/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/dalpha/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/dalpha/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -30,6 +30,9 @@
 #
 
 PORT = dalpha
+ifndef  NITROS9DIR
+NITROS9DIR     = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/dalpha/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/dalpha/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = dalpha
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/dalpha/modules/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/dalpha/modules/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -21,6 +21,9 @@
 #
 
 PORT = dalpha
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/dalpha/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/dalpha/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = dalpha
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= coco tano d64 dalpha atari
--- a/level1/tano/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/tano/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -18,6 +18,9 @@
 #
 
 PORT = tano
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/tano/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/tano/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = tano
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
--- a/level1/tano/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/tano/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = d64
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/tano/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/tano/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = tano
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/tano/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/tano/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = tano
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/tano/modules/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/tano/modules/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = tano
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/tano/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level1/tano/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = tano
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level2/coco3/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level2/coco3/bootroms/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3/bootroms/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level2/coco3/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.a $(LEVEL2)/cmds:$(LEVEL1)/cmds
--- a/level2/coco3/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level2/coco3/makefile_common	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3/makefile_common	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 LEVEL		= 2
--- a/level2/coco3/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
--- a/level2/coco3/modules/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3/modules/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm kernel:$(LEVEL2)/modules:$(LEVEL1)/modules
--- a/level2/coco3/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
--- a/level2/coco3_6309/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3_6309/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level2/coco3_6309/bootroms/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3_6309/bootroms/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level2/coco3_6309/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3_6309/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR    = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level2/coco3_6309/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/coco3_6309/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
--- a/level2/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= coco3 coco3_6309
--- a/level2/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level2/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,5 +1,8 @@
 PORT = coco3
-include ../../rules.mak
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
+include $(NITROS9DIR)/rules.mak
 
 vpath %.hp $(LEVEL1)/sys
 
--- a/level3/coco3/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level3/coco3/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL3)/cmds:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
--- a/level3/coco3/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level3/coco3/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level3/coco3/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL3)/modules/kernel:$(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
--- a/level3/coco3/modules/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3/modules/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm kernel:$(LEVEL2)/modules/kernel:$(LEVEL3)/modules:$(LEVEL2)/modules:$(LEVEL1)/modules
--- a/level3/coco3/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
--- a/level3/coco3_6309/bootfiles/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3_6309/bootfiles/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level3/coco3_6309/cmds/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3_6309/cmds/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL3)/cmds:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
--- a/level3/coco3_6309/defs/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3_6309/defs/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level3/coco3_6309/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3_6309/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6309
--- a/level3/coco3_6309/modules/kernel/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3_6309/modules/kernel/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL3)/modules/kernel:$(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
--- a/level3/coco3_6309/modules/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3_6309/modules/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm kernel:$(LEVEL2)/modules/kernel:$(LEVEL3)/modules:$(LEVEL2)/modules:$(LEVEL1)/modules
--- a/level3/coco3_6309/sys/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/level3/coco3_6309/sys/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 PORT = coco3
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
--- a/lib/alib/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/lib/alib/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,4 +1,7 @@
 # Makefile to create assembler library
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 
--- a/lib/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/lib/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 SRC = os9defs.a scfdefs.a rbfdefs.a pipedefs.a systype.a net.a
--- a/makefile	Sat Jan 12 20:52:19 2013 -0600
+++ b/makefile	Mon Jan 14 14:37:46 2013 -0600
@@ -1,3 +1,6 @@
+ifndef  NITROS9DIR
+NITROS9DIR      = $(HOME)/nitros9
+endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	=  $(NOSLIB) $(LEVEL1) $(LEVEL2) $(LEVEL3) $(3RDPARTY)
--- a/rules.mak	Sat Jan 12 20:52:19 2013 -0600
+++ b/rules.mak	Mon Jan 14 14:37:46 2013 -0600
@@ -44,7 +44,7 @@
 # Use the cross assembler
 AS		= mamou -i=$(DEFSDIR)
 #AS		= os9asm -i=$(DEFSDIR)
-#AS              = lwasm --6309 --format=os9 --pragma=pcaspcr,nosymbolcase,condundefzero --includedir=. --includedir=$(DEFSDIR)
+#AS		= lwasm --6309 --format=os9 --pragma=pcaspcr,nosymbolcase,condundefzero --includedir=. --includedir=$(DEFSDIR)
 ASOUT		= -o
 AFLAGS		= -q -aNOS9VER=$(NOS9VER) -aNOS9MAJ=$(NOS9MAJ) -aNOS9MIN=$(NOS9MIN) -aNOS9DBG=$(NOS9DBG)
 ifdef PORT
@@ -53,7 +53,9 @@
 
 # RMA/RLINK
 ASM		= rma
-LINKER	= rlink
+#ASM		= lwasm  --format=obj --pragma=pcaspcr,nosymbolcase,condundefzero --includedir=. --includedir=$(DEFSDIR)
+LINKER		= rlink
+#LINKER		= lwlink
 
 # Commands
 MAKDIR		= os9 makdir