Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

This reverts part of 54ddd00 to restore
a workaround for breakage in AmigaOS4 grep.
  • Loading branch information...
commit 1a2d7077389b1f4ec9faf5fe5a4eee7d8aefe281 1 parent d41d7e5
David Turner authored March 04, 2012

Showing 1 changed file with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. 3  Makefile.common
3  Makefile.common
@@ -153,7 +153,8 @@ endif
153 153
 # Get the current version information
154 154
 ######################################################################
155 155
 
156  
-VERSION = $(shell grep SCUMMVM_VERSION "${srcdir}/base/internal_version.h" | cut -d\" -f2)
  156
+# AmigaOS4's grep has a problem with "./" in pathnames, so use cat piped into grep.
  157
+VERSION = $(shell cat "${srcdir}/base/internal_version.h" | grep SCUMMVM_VERSION | cut -d\" -f2)
157 158
 VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
158 159
 VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
159 160
 VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)

0 notes on commit 1a2d707

Please sign in to comment.
Something went wrong with that request. Please try again.