[Scummvm-cvs-logs] scummvm master -> e85dd57ea2ecc21f90f616d5ae5de4da12b9cd7f

[sev-]

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

Summary:
2893d28700 AMIGAOS: Update amigaos.mk to automatically create an AmigaGuide file from README
30094b9d9a AMIGAOS: Fix the exe paths and delete the guide after installing
171a39d698 AMIGAOS: amigaos.mk path fixes
1c1d3f35eb AMIGAOS: amigaos.mk - Revert rx command line
e85dd57ea2 Merge pull request #655 from raziel-/patch-1


Commit: 2893d2870000211b26f1d7eb04bb024267ac2378
    https://github.com/scummvm/scummvm/commit/2893d2870000211b26f1d7eb04bb024267ac2378
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2016-01-29T18:17:42+02:00

Commit Message:
AMIGAOS: Update amigaos.mk to automatically create an AmigaGuide file from README

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 5cec9c1..5490ff2 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -10,4 +10,8 @@ amigaosdist: $(EXECUTABLE)
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/
 endif
+	cat README | sed -f convertRM.sed > README.conv
+	rx RM2AG.rx README.conv
+	rm README.conv
+	cp README.guide $(AMIGAOSPATH)
 	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)


Commit: 30094b9d9a5bb4131237ed52f60cd463ba5b2eb0
    https://github.com/scummvm/scummvm/commit/30094b9d9a5bb4131237ed52f60cd463ba5b2eb0
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2016-01-29T19:00:31+02:00

Commit Message:
AMIGAOS: Fix the exe paths and delete the guide after installing

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 5490ff2..48bd722 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -10,8 +10,9 @@ amigaosdist: $(EXECUTABLE)
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/
 endif
-	cat README | sed -f convertRM.sed > README.conv
-	rx RM2AG.rx README.conv
-	rm README.conv
+	cat README | sed -f dists/amiga/convertRM.sed > dists/amiga/README.conv
+	rx dists/amiga/RM2AG.rx dists/amiga/README.conv
 	cp README.guide $(AMIGAOSPATH)
+	rm dists/amiga/README.conv
+	rm README.guide
 	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)


Commit: 171a39d698f7eb9328839ee2443e8df8c441bd5c
    https://github.com/scummvm/scummvm/commit/171a39d698f7eb9328839ee2443e8df8c441bd5c
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2016-01-30T00:33:17+02:00

Commit Message:
AMIGAOS: amigaos.mk path fixes

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 48bd722..a468a8d 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -10,9 +10,9 @@ amigaosdist: $(EXECUTABLE)
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/
 endif
-	cat README | sed -f dists/amiga/convertRM.sed > dists/amiga/README.conv
-	rx dists/amiga/RM2AG.rx dists/amiga/README.conv
-	cp README.guide $(AMIGAOSPATH)
-	rm dists/amiga/README.conv
-	rm README.guide
+	cat ${srcdir}/README | sed -f ${srcdir}/dists/amiga/convertRM.sed > README.conv
+	rx ${srcdir}/dists/amiga/RM2AG.rx README.conv
+	cp ${srcdir}/README.guide $(AMIGAOSPATH)
+	rm ${srcdir}/README.conv
+	rm ${srcdir}/README.guide
 	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)


Commit: 1c1d3f35eb2d6e8fd50f5293d9b67858a25ffaf4
    https://github.com/scummvm/scummvm/commit/1c1d3f35eb2d6e8fd50f5293d9b67858a25ffaf4
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2016-01-30T01:14:28+02:00

Commit Message:
AMIGAOS: amigaos.mk - Revert rx command line


rx doesn't find the program if "./" or 	${srcdir} is kept in front.
Probably a limitation of abc-shell...or rx

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 a468a8d..0c3c467 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -11,7 +11,7 @@ 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
+	rx dists/amiga/RM2AG.rx README.conv
 	cp ${srcdir}/README.guide $(AMIGAOSPATH)
 	rm ${srcdir}/README.conv
 	rm ${srcdir}/README.guide


Commit: e85dd57ea2ecc21f90f616d5ae5de4da12b9cd7f
    https://github.com/scummvm/scummvm/commit/e85dd57ea2ecc21f90f616d5ae5de4da12b9cd7f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-01-30T12:20:03+01:00

Commit Message:
Merge pull request #655 from raziel-/patch-1

AMIGAOS: Update amigaos.mk to automatically create an AmigaGuide file…

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