changeset 3281:317a503d6180

level2: Set motd attributes correctly on disk images The copy operation worked, but not the attribute setting, because the full source path filename would be appended to the disk image path. So link all text files into the current directory, and operate on the relative file names, like was already done for errmsg and password.. The same error would have happened for sysgo.cfg as well, but it is currently not being copied anyway.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 19 Apr 2020 09:40:47 +0200
parents a7b26df77dcb
children 5d33751fd9f4
files level2/coco3/sys/makefile level2/mc09l2/sys/makefile
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/level2/coco3/sys/makefile	Sun Apr 19 00:42:36 2020 +0200
+++ b/level2/coco3/sys/makefile	Sun Apr 19 09:40:47 2020 +0200
@@ -6,8 +6,8 @@
 DEPENDS		= ./makefile
 
 L1TXTFILES	= errmsg password
-L2TXTFILES	= $(LEVEL2)/sys/motd
-L2SYSGOTEXTFILES = $(LEVEL2)/sys/sysgo.cfg
+L2TXTFILES	= motd
+L2SYSGOTEXTFILES = sysgo.cfg
 BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
 		ibmedcfont isolatin1font
 HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
@@ -44,11 +44,14 @@
 $(L1TXTFILES):
 	$(SOFTLINK) -f $(LEVEL1)/sys/$@
 
+$(L2TXTFILES) $(L2SYSGOTEXTFILES):
+	$(SOFTLINK) -f $(LEVEL2)/sys/$@
+
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
 	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@
 
 clean:
-	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES) inetd.conf
+	$(RM) $(ALLOBJS)
 
 showbinobjs:
 	@$(ECHO) $(BINFILES)
--- a/level2/mc09l2/sys/makefile	Sun Apr 19 00:42:36 2020 +0200
+++ b/level2/mc09l2/sys/makefile	Sun Apr 19 09:40:47 2020 +0200
@@ -6,8 +6,8 @@
 DEPENDS		= ./makefile
 
 L1TXTFILES	= errmsg password
-L2TXTFILES	= $(LEVEL2)/sys/motd
-L2SYSGOTEXTFILES = $(LEVEL2)/sys/sysgo.cfg
+L2TXTFILES	= motd
+L2SYSGOTEXTFILES = sysgo.cfg
 BINFILES	= stdfonts stdpats_2 stdpats_4 stdpats_16 stdptrs \
 		ibmedcfont isolatin1font
 HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
@@ -48,11 +48,14 @@
 $(L1TXTFILES):
 	$(SOFTLINK) -f $(LEVEL1)/sys/$@
 
+$(L2TXTFILES) $(L2SYSGOTEXTFILES):
+	$(SOFTLINK) -f $(LEVEL2)/sys/$@
+
 inetd.conf:     $(LEVEL1)/sys/inetd.conf
 	@sed -e 's/%TELNET_PORT%/$(TELNET_PORT)/' -e 's/%HTTPD_PORT%/$(HTTPD_PORT)/' $^ > $@
 
 clean:
-	$(RM) $(HELPMSG) $(L1TXTFILES) $(BINFILES) inetd.conf
+	$(RM) $(ALLOBJS)
 
 showbinobjs:
 	@$(ECHO) $(BINFILES)