[Scummvm-cvs-logs] scummvm master -> 1a2d7077389b1f4ec9faf5fe5a4eee7d8aefe281

digitall digitall at scummvm.org
Sun Mar 4 02:29:27 CET 2012


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:
1a2d707738 AmigaOS4: Adapt configure to latest SDK. Restore grep workaround.


Commit: 1a2d7077389b1f4ec9faf5fe5a4eee7d8aefe281
    https://github.com/scummvm/scummvm/commit/1a2d7077389b1f4ec9faf5fe5a4eee7d8aefe281
Author: D G Turner (digitall at scummvm.org)
Date: 2012-03-03T17:26:57-08:00

Commit Message:
AmigaOS4: Adapt configure to latest SDK. Restore grep workaround.

This reverts part of 54ddd000dcbe43f4b58d30b6b7e98775233bff01 to restore
a workaround for breakage in AmigaOS4 grep.

Changed paths:
    Makefile.common



diff --git a/Makefile.common b/Makefile.common
index 744ac49..2a92ba4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -153,7 +153,8 @@ endif
 # Get the current version information
 ######################################################################
 
-VERSION = $(shell grep SCUMMVM_VERSION "${srcdir}/base/internal_version.h" | cut -d\" -f2)
+# AmigaOS4's grep has a problem with "./" in pathnames, so use cat piped into grep.
+VERSION = $(shell cat "${srcdir}/base/internal_version.h" | grep SCUMMVM_VERSION | cut -d\" -f2)
 VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
 VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
 VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)






More information about the Scummvm-git-logs mailing list