# HG changeset patch # User Tormod Volden # Date 1385311427 -3600 # Node ID 0edac6dc70ed75af4c80568dc43f5723708e27c6 # Parent 32378c4340c018ea3b1c3eb1d354f54b4a917c6f arcadepak/makefile: Fixup the OS9COPY factorization These do the job: sed -i 's#\$(foreach file, \$(\(.*\)), \$(OS9COPY) \(.*\$(file)\) \(.*\)/\$(file);)$#$(OS9COPY) $(foreach file,$(\1),\2) \3#' 3rdparty/packages/arcadepak/makefile sed -i 's#\$(foreach file, \$(\(.*\)), \$(OS9COPY) \(.*\$(file)\) \(.*\)\$(file);)$#$(OS9COPY) $(foreach file,$(\1),\2) \3#' 3rdparty/packages/arcadepak/makefile diff -r 32378c4340c0 -r 0edac6dc70ed 3rdparty/packages/arcadepak/makefile --- a/3rdparty/packages/arcadepak/makefile Sun Nov 24 17:09:43 2013 +0100 +++ b/3rdparty/packages/arcadepak/makefile Sun Nov 24 17:43:47 2013 +0100 @@ -98,22 +98,22 @@ $(MAKDIR) $@,CMDS $(OS9COPY) shell $@,CMDS $(OS9ATTR_EXEC) $@,CMDS/shell - $(OS9COPY) $(foreach file,$(CMDS),$(6809L2)/cmds/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(CMDS),$(6809L2)/cmds/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(SMASHCMDS),smash/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(SMASHCMDS),smash/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(SMASHCMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(THEXCMDS),thexder/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(THEXCMDS),thexder/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(THEXCMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(SHANGCMDS),shanghai/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(SHANGCMDS),shanghai/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(SHANGCMDS),$@,CMDS/$(file)) $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) $(MAKDIR) $@,SYS - $(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(THEXSYS),thexder/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(SHANGSYS),shanghai/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(SMASHROOT),smash/$(file) $@,$(file)) - $(OS9COPY) $(foreach file,$(THEXROOT),thexder/$(file) $@,$(file)) - $(OS9COPY) $(foreach file,$(SHANGROOT),shanghai/$(file) $@,$(file)) + $(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(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)) $@, + $(OS9COPY) $(foreach file,$(SHANGROOT),shanghai/$(file)) $@, $(CPL) startup $@, $(DISK_80D): all @@ -127,22 +127,22 @@ $(MAKDIR) $@,CMDS $(OS9COPY) shell $@,CMDS/shell $(OS9ATTR_EXEC) $@,CMDS/shell - $(OS9COPY) $(foreach file,$(CMDS),$(6809L2)/cmds/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(CMDS),$(6809L2)/cmds/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(SMASHCMDS),smash/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(SMASHCMDS),smash/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(SMASHCMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(THEXCMDS),thexder/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(THEXCMDS),thexder/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(THEXCMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(SHANGCMDS),shanghai/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(SHANGCMDS),shanghai/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(SHANGCMDS),$@,CMDS/$(file)) $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) $(MAKDIR) $@,SYS - $(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(THEXSYS),thexder/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(SHANGSYS),shanghai/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(SMASHROOT),smash/$(file) $@,$(file)) - $(OS9COPY) $(foreach file,$(THEXROOT),thexder/$(file) $@,$(file)) - $(OS9COPY) $(foreach file,$(SHANGROOT),shanghai/$(file) $@,$(file)) + $(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(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)) $@, + $(OS9COPY) $(foreach file,$(SHANGROOT),shanghai/$(file)) $@, $(CPL) startup $@, $(DISK_DW): all @@ -156,22 +156,22 @@ $(MAKDIR) $@,CMDS $(OS9COPY) shell $@,CMDS/shell $(OS9ATTR_EXEC) $@,CMDS/shell - $(OS9COPY) $(foreach file,$(CMDS),$(6809L2)/cmds/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(CMDS),$(6809L2)/cmds/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(SMASHCMDS),smash/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(SMASHCMDS),smash/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(SMASHCMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(THEXCMDS),thexder/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(THEXCMDS),thexder/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(THEXCMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(SHANGCMDS),shanghai/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(SHANGCMDS),shanghai/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(SHANGCMDS),$@,CMDS/$(file)) $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) $(MAKDIR) $@,SYS - $(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(THEXSYS),thexder/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(SHANGSYS),shanghai/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(SMASHROOT),smash/$(file) $@,$(file)) - $(OS9COPY) $(foreach file,$(THEXROOT),thexder/$(file) $@,$(file)) - $(OS9COPY) $(foreach file,$(SHANGROOT),shanghai/$(file) $@,$(file)) + $(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(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)) $@, + $(OS9COPY) $(foreach file,$(SHANGROOT),shanghai/$(file)) $@, $(CPL) startup $@, $(DISK_BECKER): all @@ -185,22 +185,22 @@ $(MAKDIR) $@,CMDS $(OS9COPY) shell $@,CMDS/shell $(OS9ATTR_EXEC) $@,CMDS/shell - $(OS9COPY) $(foreach file,$(CMDS),$(6809L2)/cmds/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(CMDS),$(6809L2)/cmds/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(SMASHCMDS),smash/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(SMASHCMDS),smash/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(SMASHCMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(THEXCMDS),thexder/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(THEXCMDS),thexder/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(THEXCMDS),$@,CMDS/$(file)) - $(OS9COPY) $(foreach file,$(SHANGCMDS),shanghai/$(file) $@,CMDS/$(file)) + $(OS9COPY) $(foreach file,$(SHANGCMDS),shanghai/$(file)) $@,CMDS $(OS9ATTR_EXEC) $(foreach file,$(SHANGCMDS),$@,CMDS/$(file)) $(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file)) $(MAKDIR) $@,SYS - $(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(THEXSYS),thexder/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(SHANGSYS),shanghai/$(file) $@,SYS/$(file)) - $(OS9COPY) $(foreach file,$(SMASHROOT),smash/$(file) $@,$(file)) - $(OS9COPY) $(foreach file,$(THEXROOT),thexder/$(file) $@,$(file)) - $(OS9COPY) $(foreach file,$(SHANGROOT),shanghai/$(file) $@,$(file)) + $(OS9COPY) $(foreach file,$(SMASHSYS),smash/$(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)) $@, + $(OS9COPY) $(foreach file,$(SHANGROOT),shanghai/$(file)) $@, $(CPL) startup $@, clean: dskclean