Mercurial > hg > Members > kono > nitros9-code

changeset 2890:1addfd8c9d5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert e4a0f58a5f9b (set NITROS9DIR in makefiles) This was not done in lwtools-port and makes it more difficult to compare the trees. Therefore revert it for now. I will reapply or do it in another way later.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 24 Nov 2013 23:13:46 +0100
parents 0edac6dc70ed
children df598bc45426
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 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
diffstat 121 files changed, 39 insertions(+), 402 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/booters/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/booters/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../rules.mak
 
 DEPENDS		= ./makefile
 BOOTERS_L2	= boot_vhd boot_mmc_l2
--- a/3rdparty/customboots/boisy/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/customboots/boisy/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,9 +1,6 @@
 # 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	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/burke/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 DRVRS		= bb1fhdisk.dr bb1hd.dr bb1hdisk.dr bb1th.dr bb1thdisk.dr \
--- a/3rdparty/drivers/disto/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/disto/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 vpath %.asm $(LEVEL2)/modules:$(LEVEL1)/modules
 
--- a/3rdparty/drivers/emudsk/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/emudsk/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/drivers/ide/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/ide/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,9 +1,6 @@
 # Curtis Boyle's IDE Driver
 
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 DRVRS		= ccide_l1.dr ccide_l2.dr
--- a/3rdparty/drivers/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../rules.mak
 
 dirs	= burke disto emudsk ide mmc s16550 sdisk sdisk3 tccc
 
--- a/3rdparty/drivers/mmc/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/mmc/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,9 +1,6 @@
 # Jim Hathaway's MultiMediaCard NitrOS-9 driver
 
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 DRVRS		= mmcdrv_l1.dr mmcdrv_l2.dr mmcdrv_l1s.dr mmcdrv_l2s.dr 
--- a/3rdparty/drivers/s16550/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/s16550/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/drivers/sdisk/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/sdisk/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/drivers/sdisk3/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/sdisk3/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/drivers/tccc/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/drivers/tccc/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 DRVRS		= tccchd.dr
--- a/3rdparty/fmgrs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/fmgrs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../rules.mak
 
 dirs	= msf
 
--- a/3rdparty/fmgrs/msf/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/fmgrs/msf/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,10 +1,7 @@
 # MSF file manager
 #
 
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= booters drivers fmgrs p2mods subrtns utils packages
--- a/3rdparty/p2mods/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/p2mods/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../rules.mak
 
 DEPENDS		= ./makefile
 CMDS		= os9p3_sayhi sayhi tsayhi datmod tdatmod
--- a/3rdparty/p2mods/noice/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/p2mods/noice/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 AFLAGS		+= #-ASWI
--- a/3rdparty/packages/arcadepak/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/arcadepak/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 6809L2		= $(NITROS9DIR)/level2/coco3
--- a/3rdparty/packages/basic09/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/basic09/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DISK	= basic09v010100.dsk
--- a/3rdparty/packages/cc/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/cc/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../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	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/coyota/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 TARGET	= coyota
--- a/3rdparty/packages/deskmate3/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/deskmate3/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DISK	= deskmate3.dsk
--- a/3rdparty/packages/ed/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/ed/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CFLAGS += -y -q
--- a/3rdparty/packages/fsim2/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/fsim2/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/koronis/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/koronis/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/kyumgai/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/kyumgai/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-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	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/mm/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/multivue/cmds_6309/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/multivue/cmds_6309/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../cmds_6809
--- a/3rdparty/packages/multivue/cmds_6809/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/multivue/cmds_6809/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/multivue/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/multivue/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DSK68_FLOPPY	= multivue_6809.dsk
--- a/3rdparty/packages/os9l2bbs/6809l2/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/os9l2bbs/6809l2/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm ../cmds
--- a/3rdparty/packages/os9l2bbs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/os9l2bbs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	=  6809l2
--- a/3rdparty/packages/pacos9/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/pacos9/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-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	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/raakatu/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/rof/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/rof/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/sierra/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/sierra/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= blackcauldron christmas86 goldrush \
--- a/3rdparty/packages/subsim/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/subsim/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/uemacs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/uemacs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,8 +1,5 @@
 #  makefile for Micro emacs for os9/68000
 # temp files on ram disk
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CC	= c3
@@ -25,4 +22,4 @@
 $(RESTR): ueed.h
 
 clean:
-	$(RM) $(RFILES) umacs
+	$(RM) $(RFILES) umacs
\ No newline at end of file
--- a/3rdparty/packages/uucpbb/cmds_6309/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/uucpbb/cmds_6309/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/uucpbb/cmds_6809/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/uucpbb/cmds_6809/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/packages/uucpbb/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/uucpbb/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DISK68	= uucpbb21_6809.dsk
 DISK63	= uucpbb21_6309.dsk
--- a/3rdparty/packages/uucpbb/src/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/packages/uucpbb/src/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-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	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/subrtns/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/boisy/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/utils/boisy/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,10 +1,7 @@
 # OS-9 Commands/Utilities
 #
 
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/dasm/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/utils/dasm/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/utils/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../rules.mak
 
 dirs	= boisy dasm smartwatch supercomm winfo
 
--- a/3rdparty/utils/smartwatch/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/utils/smartwatch/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/supercomm/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/utils/supercomm/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/3rdparty/utils/view/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/utils/view/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 TARGET	= view
--- a/3rdparty/utils/winfo/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/3rdparty/utils/winfo/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../rules.mak
 
 DEPENDS		= ./makefile
 
--- a/bootman/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/bootman/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../rules.mak
 
 all: bootman_coco_6551 bootman_coco3_6551 #bootman_loader
 
--- a/level1/atari/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/atari/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = atari
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/atari/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/atari/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = atari
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.a $(LEVEL1)/cmds
--- a/level1/atari/defs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/atari/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/atari/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/atari/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = atari
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/atari/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/atari/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/atari/modules/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/atari/modules/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = atari
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/atari/sys/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/atari/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,8 +1,5 @@
 PORT = 
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../rules.mak
 
 vpath %.asm $(3RDPARTY)/packages/basic09
 
--- a/level1/coco/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/coco/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/coco/bootroms/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/coco/bootroms/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/coco/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/coco/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.a $(LEVEL1)/cmds
--- a/level1/coco/defs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/coco/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/coco/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/coco/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/coco/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/coco/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/coco/modules/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/coco/modules/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/coco/sys/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/coco/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/d64/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/d64/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -18,9 +18,6 @@
 #
 
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/d64/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/d64/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
--- a/level1/d64/defs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/d64/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/d64/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/d64/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -30,9 +30,6 @@
 #
 
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR     = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/d64/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/d64/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/d64/modules/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/d64/modules/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -21,9 +21,6 @@
 #
 
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/d64/sys/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/d64/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR     = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/dalpha/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/dalpha/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -18,9 +18,6 @@
 #
 
 PORT = dalpha
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/dalpha/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/dalpha/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = dalpha
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
--- a/level1/dalpha/defs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/dalpha/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/dalpha/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/dalpha/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -30,9 +30,6 @@
 #
 
 PORT = dalpha
-ifndef  NITROS9DIR
-NITROS9DIR     = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/dalpha/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/dalpha/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = dalpha
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/dalpha/modules/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/dalpha/modules/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -21,9 +21,6 @@
 #
 
 PORT = dalpha
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/dalpha/sys/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/dalpha/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = dalpha
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= coco tano d64 dalpha atari
--- a/level1/tano/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/tano/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -18,9 +18,6 @@
 #
 
 PORT = tano
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/tano/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/tano/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = tano
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/cmds:$(3RDPARTY)/packages/basic09
--- a/level1/tano/defs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/tano/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = d64
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/tano/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/tano/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = tano
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/tano/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/tano/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = tano
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/tano/modules/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/tano/modules/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = tano
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/tano/sys/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level1/tano/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = tano
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level2/coco3/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level2/coco3/bootroms/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3/bootroms/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level2/coco3/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,4 @@
-ifndef NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
+
 include $(CC368L2)/cmds/makefile_common
 LFLAGS          += -l=$(NITROS9DIR)/lib/sys6809l2.l
--- a/level2/coco3/defs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level2/coco3/makefile_common	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3/makefile_common	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 LEVEL		= 2
--- a/level2/coco3/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 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	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3/modules/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm kernel:$(LEVEL2)/modules:$(LEVEL1)/modules
--- a/level2/coco3/sys/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
--- a/level2/coco3_6309/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3_6309/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level2/coco3_6309/bootroms/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3_6309/bootroms/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level2/coco3_6309/defs/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3_6309/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR    = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level2/coco3_6309/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/coco3_6309/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
--- a/level2/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 dirs	= coco3 coco3_6309
--- a/level2/sys/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level2/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,8 +1,5 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../rules.mak
 
 vpath %.hp $(LEVEL1)/sys
 
--- a/level3/coco3/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level3/coco3/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 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	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level3/coco3/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level3/coco3/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 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	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3/modules/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 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	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
--- a/level3/coco3_6309/bootfiles/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3_6309/bootfiles/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level3/coco3_6309/cmds/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3_6309/cmds/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 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	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3_6309/defs/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level3/coco3_6309/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3_6309/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6309
--- a/level3/coco3_6309/modules/kernel/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3_6309/modules/kernel/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 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	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3_6309/modules/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 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	Sun Nov 24 17:43:47 2013 +0100
+++ b/level3/coco3_6309/sys/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 PORT = coco3
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp $(LEVEL2)/sys:$(LEVEL1)/sys
--- a/lib/alib/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/lib/alib/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,7 +1,4 @@
 # Makefile to create assembler library
-ifndef  NITROS9DIR
-NITROS9DIR      = $(HOME)/nitros9
-endif
 include $(NITROS9DIR)/rules.mak
 
 
--- a/lib/makefile	Sun Nov 24 17:43:47 2013 +0100
+++ b/lib/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,6 +1,3 @@
-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	Sun Nov 24 17:43:47 2013 +0100
+++ b/makefile	Sun Nov 24 23:13:46 2013 +0100
@@ -1,8 +1,4 @@
-ifndef  NITROS9DIR
-NITROS9DIR      := $(HOME)/nitros9
-export NITROS9DIR
-endif
-include $(NITROS9DIR)/rules.mak
+include rules.mak
 
 dirs	=  $(NOSLIB) $(LEVEL1) $(LEVEL2) $(LEVEL3) $(3RDPARTY)