diff options
| author | D G Turner | 2012-03-04 01:26:57 +0000 |
|---|---|---|
| committer | D G Turner | 2012-03-04 01:26:57 +0000 |
| commit | 1a2d7077389b1f4ec9faf5fe5a4eee7d8aefe281 (patch) | |
| tree | 35a2649737080c2f0a17041b4757803917c99e4f | |
| parent | d41d7e5f3688b3d83323d9240fe744ba8d339307 (diff) | |
| download | scummvm-rg350-1a2d7077389b1f4ec9faf5fe5a4eee7d8aefe281.tar.gz scummvm-rg350-1a2d7077389b1f4ec9faf5fe5a4eee7d8aefe281.tar.bz2 scummvm-rg350-1a2d7077389b1f4ec9faf5fe5a4eee7d8aefe281.zip | |
AmigaOS4: Adapt configure to latest SDK. Restore grep workaround.
This reverts part of 54ddd000dcbe43f4b58d30b6b7e98775233bff01 to restore
a workaround for breakage in AmigaOS4 grep.
| -rw-r--r-- | Makefile.common | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index 744ac493e3..2a92ba441c 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) |