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

[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:
c1c4320b34 AMIGAOS4: Reorder .mk file to fix readme.guide


Commit: c1c4320b348a77e7eb84f97af214d46250667182
    https://github.com/scummvm/scummvm/commit/c1c4320b348a77e7eb84f97af214d46250667182
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-08-26T23:45:39+02:00

Commit Message:
AMIGAOS4: Reorder .mk file to fix readme.guide

The created readme.guide file features some in-guide links that point to local files (I.e. AUTHORS), which need to be in the same directory level.
It will otherwise silently fail, when a user clicks on said links.

Due to all documents (except the readme.guide) being installed into the doc/ subdirectory since a few months now, the in-guide links stopped working.
We fix that by restructure the install order to
1) place the .guide creation into the documents loop
2) make sure the /doc subdirectory is available before the guide creation is processed and
3) place the readme.guide into the /doc subdir to secure working in-guide links

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 e9efe361c7..1fe85615b2 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -5,21 +5,21 @@ amigaosdist: $(EXECUTABLE) $(PLUGINS)
 	mkdir -p $(AMIGAOSPATH)/extras
 	cp ${srcdir}/dists/amiga/scummvm_drawer.info $(AMIGAOSPATH).info
 	cp ${srcdir}/dists/amiga/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info
-# Copy mandatory installation files.
+ifdef DIST_FILES_DOCS
+	mkdir -p $(AMIGAOSPATH)/doc
+	cp -r $(srcdir)/doc/ $(AMIGAOSPATH)
+	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)/doc/
 # Prepare README.md for AmigaGuide conversion.
 	cat ${srcdir}/README.md | sed -f ${srcdir}/dists/amiga/convertRM.sed > README.conv
 # AmigaOS AREXX has a problem when ${srcdir} is '.'.
 # It will break with a "Program not found" error.
 # Copy the script to cwd and, once it has finished, remove it.
 	cp ${srcdir}/dists/amiga/RM2AG.rexx .
-	rx RM2AG.rexx README.conv $(AMIGAOSPATH)
+	rx RM2AG.rexx README.conv $(AMIGAOSPATH)/doc/
 	rm README.conv
 	rm RM2AG.rexx
-ifdef DIST_FILES_DOCS
-	mkdir -p $(AMIGAOSPATH)/doc
-	cp -r $(srcdir)/doc/ $(AMIGAOSPATH)
-	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)/doc/
 endif
+# Copy mandatory installation files.
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/
 endif