changeset 3282:5d33751fd9f4

level2/3: Generate motd in makefile so LEVEL is right Also add the NitrOS-9 version because that becomes easy then.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 19 Apr 2020 14:42:50 +0200
parents 317a503d6180
children aa4b1bd0d9c5
files level2/coco3/sys/makefile level2/mc09l2/sys/makefile level2/sys/motd level3/coco3/sys/motd level3/coco3_6309/sys/motd
diffstat 5 files changed, 16 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/sys/makefile	Sun Apr 19 09:40:47 2020 +0200
+++ b/level2/coco3/sys/makefile	Sun Apr 19 14:42:50 2020 +0200
@@ -6,7 +6,6 @@
 DEPENDS		= ./makefile
 
 L1TXTFILES	= errmsg password
-L2TXTFILES	= motd
 L2SYSGOTEXTFILES = sysgo.cfg
 BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
 		ibmedcfont isolatin1font
@@ -34,7 +33,7 @@
 
 TEXTFILES	= $(L2TXTFILES) $(HELPMSG) $(L1TXTFILES)
 SYSGOTEXTFILES = $(L2SYSGOTEXTFILES)
-ALLOBJS = $(TEXTFILES) $(SYSGOTEXTFILES) $(BINFILES) inetd.conf
+ALLOBJS = $(TEXTFILES) $(SYSGOTEXTFILES) $(BINFILES) motd inetd.conf
 
 all:	$(ALLOBJS) $(DEPENDS)
 
@@ -44,9 +43,14 @@
 $(L1TXTFILES):
 	$(SOFTLINK) -f $(LEVEL1)/sys/$@
 
-$(L2TXTFILES) $(L2SYSGOTEXTFILES):
+$(L2SYSGOTEXTFILES):
 	$(SOFTLINK) -f $(LEVEL2)/sys/$@
 
+motd:
+	@$(ECHO) > $@
+	@$(ECHO) "Welcome to NitrOS-9 Level $(LEVEL) $(NITROS9VER) !" >> $@
+	@$(ECHO) >> $@
+
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
 	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@
 
@@ -57,7 +61,7 @@
 	@$(ECHO) $(BINFILES)
 
 showtextobjs:
-	@$(ECHO) $(TEXTFILES) inetd.conf
+	@$(ECHO) $(TEXTFILES) motd inetd.conf
 
 showsysgotextobjs:
 	@$(ECHO) $(SYSGOTEXTFILES)
--- a/level2/mc09l2/sys/makefile	Sun Apr 19 09:40:47 2020 +0200
+++ b/level2/mc09l2/sys/makefile	Sun Apr 19 14:42:50 2020 +0200
@@ -6,7 +6,6 @@
 DEPENDS		= ./makefile
 
 L1TXTFILES	= errmsg password
-L2TXTFILES	= motd
 L2SYSGOTEXTFILES = sysgo.cfg
 BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
 		ibmedcfont isolatin1font
@@ -38,7 +37,7 @@
 
 TEXTFILES	= $(L2TXTFILES) $(HELPMSG) $(L1TXTFILES)
 SYSGOTEXTFILES = $(L2SYSGOTEXTFILES)
-ALLOBJS = $(TEXTFILES) $(SYSGOTEXTFILES) $(BINFILES) inetd.conf
+ALLOBJS = $(TEXTFILES) $(SYSGOTEXTFILES) $(BINFILES) motd inetd.conf
 
 all:	$(ALLOBJS) $(DEPENDS)
 
@@ -48,9 +47,14 @@
 $(L1TXTFILES):
 	$(SOFTLINK) -f $(LEVEL1)/sys/$@
 
-$(L2TXTFILES) $(L2SYSGOTEXTFILES):
+$(L2SYSGOTEXTFILES):
 	$(SOFTLINK) -f $(LEVEL2)/sys/$@
 
+motd:
+	@$(ECHO) > $@
+	@$(ECHO) "Welcome to NitrOS-9 Level $(LEVEL) $(NITROS9VER) !" >> $@
+	@$(ECHO) >> $@
+
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
 	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@
 
@@ -61,7 +65,7 @@
 	@$(ECHO) $(BINFILES)
 
 showtextobjs:
-	@$(ECHO) $(TEXTFILES) inetd.conf
+	@$(ECHO) $(TEXTFILES) motd inetd.conf
 
 showsysgotextobjs:
 	@$(ECHO) $(SYSGOTEXTFILES)
--- a/level2/sys/motd	Sun Apr 19 09:40:47 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-
-Welcome to NitrOS-9 Level 2!
-
--- a/level3/coco3/sys/motd	Sun Apr 19 09:40:47 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-
-Welcome to NitrOS-9 Level 3!
-
--- a/level3/coco3_6309/sys/motd	Sun Apr 19 09:40:47 2020 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-
-Welcome to NitrOS-9 Level 3!
-