diff options
| author | frosch <frosch@openttd.org> | 2010-09-01 20:17:25 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-09-01 20:17:25 +0000 |
| commit | e640373475375d2bd2f5f4215b0d58b7002175f7 (patch) | |
| tree | f56343bf6ca84db9e8d494401a7fb87a89fd49b3 | |
| parent | e90e831f2e8018791f387e4c9a0896d3b20f47a9 (diff) | |
| download | openttd-e640373475375d2bd2f5f4215b0d58b7002175f7.tar.xz | |
(svn r20715) -Fix: Recent nforenum does not know '-?'.
| -rw-r--r-- | Makefile.grf.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.grf.in b/Makefile.grf.in index 86403991e..9be2c7a26 100644 --- a/Makefile.grf.in +++ b/Makefile.grf.in @@ -55,7 +55,7 @@ $(OBJS_DIR)/sprites: # Generic $(BIN_DIR)/openttd.grf: $(PCX_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites @# Only try; if nforenum isn't available, just retouch the file as they likely didn't need it anyway. - $(Q) ($(NFORENUM) -? > /dev/null 2>&1 && $(MAKE) $(OBJS_DIR)/openttd.grf && cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf) || ([ -e $(BIN_DIR)/openttd.grf ] && touch $(BIN_DIR)/openttd.grf && echo "no NFORenum and GRFCodec found, skipping rebuild of openttd.grf...") || (echo "no NFORenum and GRFCodec found, but no openttd.grf either. Install NFORenum and GRFCodec." && exit 1) + $(Q) ($(NFORENUM) --help > /dev/null 2>&1 && $(MAKE) $(OBJS_DIR)/openttd.grf && cp $(OBJS_DIR)/openttd.grf $(BIN_DIR)/openttd.grf) || ([ -e $(BIN_DIR)/openttd.grf ] && touch $(BIN_DIR)/openttd.grf && echo "no NFORenum and GRFCodec found, skipping rebuild of openttd.grf...") || (echo "no NFORenum and GRFCodec found, but no openttd.grf either. Install NFORenum and GRFCodec." && exit 1) # Yeah, we'd like to use -i in the sed, but Mac OS X's sed and GNU sed just can't agree on the usage of -i. In any case either one of them fails. $(OBJS_DIR)/openttd.grf: $(PCX_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites |