Changeset - r15894:6346341f669e
[Not reviewed]
master
0 1 0
rubidium - 14 years ago 2010-08-21 11:30:41
rubidium@openttd.org
(svn r20588) -Fix (r20586): apparantly some NFORenums don't return an error code when an unknown command line option is given
1 file changed with 3 insertions and 1 deletions:
0 comments (0 inline, 0 general)
Makefile.grf.in
Show inline comments
 
@@ -32,14 +32,16 @@ ifdef VERBOSE
 
else
 
	Q = @
 
	E = @echo
 
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.
 
NFO_FILES    := $(GRF_DIR)/*.nfo
 
PCX_FILES    := $(GRF_DIR)/*.pcx
 

	
0 comments (0 inline, 0 general)