[Scummvm-cvs-logs] scummvm master -> 89e9a36af546921afa7b870430e0405b0aa87048

[lordhoto]

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:
89e9a36af5 AMIGAOS: Fix 'amigaosdist' for in-tree builds on AmigaOS.


Commit: 89e9a36af546921afa7b870430e0405b0aa87048
    https://github.com/scummvm/scummvm/commit/89e9a36af546921afa7b870430e0405b0aa87048
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2016-02-17T11:58:48+01:00

Commit Message:
AMIGAOS: Fix 'amigaosdist' for in-tree builds on AmigaOS.

AmigaOS's Rexx interpreter seems to have problems with './' in the path to the
Rexx script. We work around this by copying it to the cwd and using it from
there.

Manual merge of PR #669 "AMIGAOS: Fix amigaos.mk to make the rexx script work
on local builds".

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



diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
index ed0fd1d..c4928ec 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -11,8 +11,13 @@ ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/
 endif
 	cat ${srcdir}/README | sed -f ${srcdir}/dists/amiga/convertRM.sed > README.conv
-	rx ${srcdir}/dists/amiga/RM2AG.rx README.conv
+	# AREXX seems to have problems when ${srcdir} is '.'. It will break with a
+	# "Program not found" error. Therefore we copy the script to the cwd and
+	# remove it again, once it has finished.
+	cp ${srcdir}/dists/amiga/RM2AG.rx .
+	rx RM2AG.rx README.conv
 	cp README.guide $(AMIGAOSPATH)
+	rm RM2AG.rx
 	rm README.conv
 	rm README.guide
 	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)