Mercurial > hg > openttd
changeset 15904:320f1d757e41 draft
(svn r20588) -Fix (r20586): apparantly some NFORenums don't return an error code when an unknown command line option is given
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sat, 21 Aug 2010 11:30:41 +0000 |
| parents | 7585966382b1 |
| children | bb51b6de7c6a |
| files | Makefile.grf.in |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.grf.in +++ b/Makefile.grf.in @@ -35,8 +35,10 @@ endif # Some configurational settings for your environment. +# If GRFCodec doesn't know a command, it'll exit with a non-zero exit code. GRFCODEC := $(shell grfcodec -s -v >/dev/null 2>/dev/null && echo "grfcodec -s" || echo "grfcodec") -NFORENUM := $(shell nforenum -s -v >/dev/null 2>/dev/null && echo "nforenum -s" || echo "nforenum") +# Old NFORenums don't give an error code when a parameter isn't known, so we have to work around that. +NFORENUM := $(shell [ `nforenum -s -v 2>/dev/null | wc -l ` -eq 1 ] && echo "nforenum -s" || echo "nforenum") MD5SUM := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum") # Some "should not be changed" settings.