Mercurial > hg > Members > kono > nitros9-code

changeset 1856:6cbe386d981f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Corrected issue in makefiles so that directory under NITROS9 is properly named
author boisy
date Tue, 12 Jul 2005 11:19:59 +0000
parents 40decaec2ea2
children b2e1a713113d
files level1/makefile level2/makefile scripts/bundi
diffstat 3 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Sat Jul 02 14:06:34 2005 +0000
+++ b/level1/makefile	Tue Jul 12 11:19:59 2005 +0000
@@ -7,7 +7,8 @@
 #WHICHSHELL	= shellplus
 WHICHSHELL	= shell_21
 
-DISTRO		= nos9$(CPU)l$(LEVEL)
+DISTRO		= $(CPU)L$(LEVEL)
+DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRO)$(NITROS9VER)
 BOOTFILE_CO32	= bootfiles/bootfile_co32
 BOOTFILE_CO51	= bootfiles/bootfile_co51
@@ -33,11 +34,11 @@
 
 PACKAGENAME	= $(DISTROVER).zip
 DSK360K_1       = $(DISTROVER)_40d_1.dsk
-LDSK360K_1      = $(DISTRO)_40d_1.dsk
+LDSK360K_1      = $(DISTRONAME)_40d_1.dsk
 DSK360K_2       = $(DISTROVER)_40d_2.dsk
-LDSK360K_2      = $(DISTRO)_40d_2.dsk
+LDSK360K_2      = $(DISTRONAME)_40d_2.dsk
 DSK720K         = $(DISTROVER)_80d.dsk
-LDSK720K        = $(DISTRO)_80d.dsk
+LDSK720K        = $(DISTRONAME)_80d.dsk
 
 
 # Make all components
--- a/level2/makefile	Sat Jul 02 14:06:34 2005 +0000
+++ b/level2/makefile	Tue Jul 12 11:19:59 2005 +0000
@@ -3,7 +3,8 @@
 CPU		= 6809
 LEVEL		= 2
 
-DISTRO		= nos9$(CPU)l$(LEVEL)
+DISTRO		= $(CPU)L$(LEVEL)
+DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRO)$(NITROS9VER)
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
@@ -31,15 +32,15 @@
 
 PACKAGENAME	= $(DISTROVER).zip
 DSK360K_1	= $(DISTROVER)_40d_1.dsk
-LDSK360K_1	= $(DISTRO)_40d_1.dsk
+LDSK360K_1	= $(DISTRONAME)_40d_1.dsk
 DSK360K_1_50HZ	= $(DISTROVER)_40d_1_50hz.dsk
-LDSK360K_1_50HZ	= $(DISTRO)_40d_1_50hz.dsk
+LDSK360K_1_50HZ	= $(DISTRONAME)_40d_1_50hz.dsk
 DSK360K_2	= $(DISTROVER)_40d_2.dsk
-LDSK360K_2	= $(DISTRO)_40d_2.dsk
+LDSK360K_2	= $(DISTRONAME)_40d_2.dsk
 DSK720K		= $(DISTROVER)_80d.dsk
-LDSK720K	= $(DISTRO)_80d.dsk
+LDSK720K	= $(DISTRONAME)_80d.dsk
 DSK720K_50HZ	= $(DISTROVER)_80d_50hz.dsk
-LDSK720K_50HZ	= $(DISTRO)_80d_50hz.dsk
+LDSK720K_50HZ	= $(DISTRONAME)_80d_50hz.dsk
 TESTDSK		= test.dsk
 
 
--- a/scripts/bundi	Sat Jul 02 14:06:34 2005 +0000
+++ b/scripts/bundi	Tue Jul 12 11:19:59 2005 +0000
@@ -77,6 +77,6 @@
 echo "Step 3 - Put it all together"
 rm $diskname
 cat tmp.dsk hdbdrives.dsk>$diskname
-rm tmp.dsk hdbdrives.dsk
+#rm tmp.dsk hdbdrives.dsk
 
 echo "Ok, we're done! The file $diskname is now a fresh disk image."