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

[digitall]

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

Summary:
5efe1047b1 BUILD: Fix AmigaOS4 build variable naming to be clearer.
fd89ecdba8 BUILD: Change AmigaOS4 packaging target to "amigaos4dist".


Commit: 5efe1047b1bf04bd2c0812566c7a8b805169ed48
    https://github.com/scummvm/scummvm/commit/5efe1047b1bf04bd2c0812566c7a8b805169ed48
Author: D G Turner (digitall at scummvm.org)
Date: 2014-07-20T03:22:33+01:00

Commit Message:
BUILD: Fix AmigaOS4 build variable naming to be clearer.

Changed paths:
    configure
    ports.mk



diff --git a/configure b/configure
index 0635907..4f9fc4f 100755
--- a/configure
+++ b/configure
@@ -168,7 +168,7 @@ _as="as"
 _windres=windres
 _stagingpath="staging"
 _win32path="c:/scummvm"
-_aos4path="Games:ScummVM"
+_amigaos4path="Games:ScummVM"
 _staticlibpath=
 _sdlconfig=sdl-config
 _freetypeconfig=freetype-config
@@ -4499,7 +4499,7 @@ WINDRES := $_windres
 WINDRESFLAGS := $WINDRESFLAGS
 STAGINGPATH=$_stagingpath
 WIN32PATH=$_win32path
-AOS4PATH=$_aos4path
+AMIGAOS4PATH=$_amigaos4path
 STATICLIBPATH=$_staticlibpath
 
 BACKEND := $_backend
diff --git a/ports.mk b/ports.mk
index 32b1e67..0b6c2fd 100644
--- a/ports.mk
+++ b/ports.mk
@@ -330,16 +330,16 @@ endif
 
 # Special target to create an AmigaOS snapshot installation
 aos4dist: $(EXECUTABLE)
-	mkdir -p $(AOS4PATH)
-	mkdir -p $(AOS4PATH)/themes
-	mkdir -p $(AOS4PATH)/extras
-	$(STRIP) $(EXECUTABLE) -o $(AOS4PATH)/$(EXECUTABLE)
-	cp ${srcdir}/icons/scummvm.info $(AOS4PATH)/$(EXECUTABLE).info
-	cp $(DIST_FILES_THEMES) $(AOS4PATH)/themes/
+	mkdir -p $(AMIGAOS4PATH)
+	mkdir -p $(AMIGAOS4PATH)/themes
+	mkdir -p $(AMIGAOS4PATH)/extras
+	$(STRIP) $(EXECUTABLE) -o $(AMIGAOS4PATH)/$(EXECUTABLE)
+	cp ${srcdir}/icons/scummvm.info $(AMIGAOS4PATH)/$(EXECUTABLE).info
+	cp $(DIST_FILES_THEMES) $(AMIGAOS4PATH)/themes/
 ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) $(AOS4PATH)/extras/
+	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOS4PATH)/extras/
 endif
-	cp $(DIST_FILES_DOCS) $(AOS4PATH)
+	cp $(DIST_FILES_DOCS) $(AMIGAOS4PATH)
 
 # Mark special targets as phony
 .PHONY: deb bundle osxsnap win32dist install uninstall


Commit: fd89ecdba81f88b197812650efce51a0827463ba
    https://github.com/scummvm/scummvm/commit/fd89ecdba81f88b197812650efce51a0827463ba
Author: D G Turner (digitall at scummvm.org)
Date: 2014-07-20T03:24:09+01:00

Commit Message:
BUILD: Change AmigaOS4 packaging target to "amigaos4dist".

This is a clearer naming, but needs update to buildbot to support.
AmigaOS4 Porter (raziel_) is already aware of this.

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index 0b6c2fd..66e0108 100644
--- a/ports.mk
+++ b/ports.mk
@@ -329,7 +329,7 @@ endif
 #
 
 # Special target to create an AmigaOS snapshot installation
-aos4dist: $(EXECUTABLE)
+amigaos4dist: $(EXECUTABLE)
 	mkdir -p $(AMIGAOS4PATH)
 	mkdir -p $(AMIGAOS4PATH)/themes
 	mkdir -p $(AMIGAOS4PATH)/extras