Mercurial > hg > Members > kono > nitros9-code

changeset 2866:854ef52e512f lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3rdparty/packages/arcadepak: Resolve ia.fnt copy conflict Smash and Thexter ship the same ia.fnt file so to avoid "file already exists" errors when copying these files to the disk image, use os9copy -r to overwrite.
author Tormod Volden <debian.tormod@gmail.com>
date Tue, 01 Oct 2013 00:04:17 +0200
parents 0f6123a8756e
children b14ea1930107
files 3rdparty/packages/arcadepak/makefile
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/arcadepak/makefile	Mon Sep 30 23:40:38 2013 +0200
+++ b/3rdparty/packages/arcadepak/makefile	Tue Oct 01 00:04:17 2013 +0200
@@ -106,7 +106,7 @@
 	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MAKDIR) $@,SYS
 	$(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(file)) $@,SYS
-	$(OS9COPY) $(foreach file,$(THEXSYS),thexder/$(file)) $@,SYS
+	$(OS9COPY) -r $(foreach file,$(THEXSYS),thexder/$(file)) $@,SYS
 	$(OS9COPY) $(foreach file,$(SHANGSYS),shanghai/$(file)) $@,SYS
 	$(OS9COPY) $(foreach file,$(SMASHROOT),smash/$(file)) $@,
 	$(OS9COPY) $(foreach file,$(THEXROOT),thexder/$(file)) $@,
@@ -135,7 +135,7 @@
 	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MAKDIR) $@,SYS
 	$(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(file)) $@,SYS
-	$(OS9COPY) $(foreach file,$(THEXSYS),thexder/$(file)) $@,SYS
+	$(OS9COPY) -r $(foreach file,$(THEXSYS),thexder/$(file)) $@,SYS
 	$(OS9COPY) $(foreach file,$(SHANGSYS),shanghai/$(file)) $@,SYS
 	$(OS9COPY) $(foreach file,$(SMASHROOT),smash/$(file)) $@,
 	$(OS9COPY) $(foreach file,$(THEXROOT),thexder/$(file)) $@,
@@ -164,7 +164,7 @@
 	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MAKDIR) $@,SYS
 	$(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(file)) $@,SYS
-	$(OS9COPY) $(foreach file,$(THEXSYS),thexder/$(file)) $@,SYS
+	$(OS9COPY) -r $(foreach file,$(THEXSYS),thexder/$(file)) $@,SYS
 	$(OS9COPY) $(foreach file,$(SHANGSYS),shanghai/$(file)) $@,SYS
 	$(OS9COPY) $(foreach file,$(SMASHROOT),smash/$(file)) $@,
 	$(OS9COPY) $(foreach file,$(THEXROOT),thexder/$(file)) $@,
@@ -193,7 +193,7 @@
 	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
 	$(MAKDIR) $@,SYS
 	$(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(file)) $@,SYS
-	$(OS9COPY) $(foreach file,$(THEXSYS),thexder/$(file)) $@,SYS
+	$(OS9COPY) -r $(foreach file,$(THEXSYS),thexder/$(file)) $@,SYS
 	$(OS9COPY) $(foreach file,$(SHANGSYS),shanghai/$(file)) $@,SYS
 	$(OS9COPY) $(foreach file,$(SMASHROOT),smash/$(file)) $@,
 	$(OS9COPY) $(foreach file,$(THEXROOT),thexder/$(file)) $@,