Mercurial > hg > Members > kono > nitros9-code

changeset 3280:a7b26df77dcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
level3/makefile: Avoid copying same files twice to disk image
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 19 Apr 2020 00:42:36 +0200
parents cbb116c092de
children 317a503d6180
files level3/coco3/makefile
diffstat 1 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/level3/coco3/makefile	Sun Apr 19 00:05:13 2020 +0200
+++ b/level3/coco3/makefile	Sun Apr 19 00:42:36 2020 +0200
@@ -214,10 +214,8 @@
 	$(MAKDIR) $@,DEFS
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
-	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(OS9COPY) $(sort $(CMDS) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS) $(CMDS_D2)),$@,CMDS/$(file))
 	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYSBIN),$@,SYS/$(file))
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
@@ -269,10 +267,8 @@
 	$(MAKDIR) $@,DEFS
 	$(OS9COPY) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
-	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
-	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
+	$(CD) cmds; $(OS9COPY) $(sort $(CMDS) $(CMDS_D2)) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(sort $(CMDS) $(CMDS_D2)),$@,CMDS/$(file))
 	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
 	$(OS9ATTR_TEXT) $(foreach file,$(SYSBIN),$@,SYS/$(file))
 	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS