[Scummvm-git-logs] scummvm master -> c52addd0012cbe8d2963c2429ef27de645616ee3

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c52addd001 RISCOS: Use a variable for the application name


Commit: c52addd0012cbe8d2963c2429ef27de645616ee3
    https://github.com/scummvm/scummvm/commit/c52addd0012cbe8d2963c2429ef27de645616ee3
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-07-23T09:36:46+02:00

Commit Message:
RISCOS: Use a variable for the application name

Changed paths:
    backends/platform/sdl/riscos/riscos.mk


diff --git a/backends/platform/sdl/riscos/riscos.mk b/backends/platform/sdl/riscos/riscos.mk
index 297c409..0a1ed81 100644
--- a/backends/platform/sdl/riscos/riscos.mk
+++ b/backends/platform/sdl/riscos/riscos.mk
@@ -4,31 +4,33 @@ else
 ENCODING=ISO-8859-1//TRANSLIT
 endif
 
+APP_NAME=!ScummVM
+
 # Special target to create an RISC OS snapshot installation
-riscosdist: scummvm$(EXEEXT)
-	mkdir -p !ScummVM
-	elf2aif scummvm$(EXEEXT) !ScummVM/scummvm,ff8
-	cp ${srcdir}/dists/riscos/!Boot,feb !ScummVM/!Boot,feb
-	cp ${srcdir}/dists/riscos/!Run,feb !ScummVM/!Run,feb
-	cp ${srcdir}/dists/riscos/!Sprites,ff9 !ScummVM/!Sprites,ff9
-	cp ${srcdir}/dists/riscos/!Sprites11,ff9 !ScummVM/!Sprites11,ff9
-	sed -i -e "s/|WimpSlot/WimpSlot -min `du -k !ScummVM/scummvm,ff8 | cut -f1`K/g" !ScummVM/!Run,feb
-	mkdir -p !ScummVM/data
-	cp $(DIST_FILES_THEMES) !ScummVM/data/
+riscosdist: all
+	mkdir -p $(APP_NAME)
+	elf2aif $(EXECUTABLE) $(APP_NAME)/scummvm,ff8
+	cp ${srcdir}/dists/riscos/!Boot,feb $(APP_NAME)/!Boot,feb
+	cp ${srcdir}/dists/riscos/!Run,feb $(APP_NAME)/!Run,feb
+	cp ${srcdir}/dists/riscos/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9
+	cp ${srcdir}/dists/riscos/!Sprites11,ff9 $(APP_NAME)/!Sprites11,ff9
+	sed -i -e "s/|WimpSlot/WimpSlot -min `du -k $(APP_NAME)/scummvm,ff8 | cut -f1`K/g" $(APP_NAME)/!Run,feb
+	mkdir -p $(APP_NAME)/data
+	cp $(DIST_FILES_THEMES) $(APP_NAME)/data/
 ifdef DIST_FILES_NETWORKING
-	cp $(DIST_FILES_NETWORKING) !ScummVM/data/
+	cp $(DIST_FILES_NETWORKING) $(APP_NAME)/data/
 endif
 ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) !ScummVM/data/
+	cp $(DIST_FILES_ENGINEDATA) $(APP_NAME)/data/
 endif
 ifdef DYNAMIC_MODULES
-	mkdir -p !ScummVM/plugins
-	cp $(PLUGINS) !ScummVM/plugins/
+	mkdir -p $(APP_NAME)/plugins
+	cp $(PLUGINS) $(APP_NAME)/plugins/
 endif
-	mkdir -p !ScummVM/docs
-	cp ${srcdir}/dists/riscos/!Help,feb !ScummVM/!Help,feb
+	mkdir -p $(APP_NAME)/docs
+	cp ${srcdir}/dists/riscos/!Help,feb $(APP_NAME)/!Help,feb
 ifdef TOKENIZE
-	$(TOKENIZE) dists/riscos/FindHelp,fd1 -out !ScummVM/FindHelp,ffb
+	$(TOKENIZE) dists/riscos/FindHelp,fd1 -out $(APP_NAME)/FindHelp,ffb
 endif
-	@$(foreach file, $(DIST_FILES_DOCS) $(srcdir)/doc/QuickStart, echo '   ' ICONV '  ' !ScummVM/docs/$(notdir $(file)),fff;iconv --to-code=$(ENCODING) $(file) > !ScummVM/docs/$(notdir $(file)),fff;)
-	@$(foreach lang, $(DIST_FILES_DOCS_languages), mkdir -p !ScummVM/docs/$(lang); $(foreach file, $(DIST_FILES_DOCS_$(lang)), echo '   ' ICONV '  ' !ScummVM/docs/$(lang)/$(notdir $(file)),fff;iconv --to-code=$(ENCODING) $(file) > !ScummVM/docs/$(lang)/$(notdir $(file)),fff;))
+	@$(foreach file, $(DIST_FILES_DOCS) $(srcdir)/doc/QuickStart, echo '   ' ICONV '  ' $(APP_NAME)/docs/$(notdir $(file)),fff;iconv --to-code=$(ENCODING) $(file) > $(APP_NAME)/docs/$(notdir $(file)),fff;)
+	@$(foreach lang, $(DIST_FILES_DOCS_languages), mkdir -p $(APP_NAME)/docs/$(lang); $(foreach file, $(DIST_FILES_DOCS_$(lang)), echo '   ' ICONV '  ' $(APP_NAME)/docs/$(lang)/$(notdir $(file)),fff;iconv --to-code=$(ENCODING) $(file) > $(APP_NAME)/docs/$(lang)/$(notdir $(file)),fff;))