[iortcw] 375/497: All: build: if tput fails, fall back to a reasonable text width

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 60c054d0f0557d0542d75b0a8f41a2cdb2c501a7
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Fri Jul 24 08:24:03 2015 -0400

    All: build: if tput fails, fall back to a reasonable text width
---
 MP/Makefile | 2 +-
 SP/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MP/Makefile b/MP/Makefile
index c00c81d..08ccf1d 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -1304,7 +1304,7 @@ release:
 	  CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
 
 ifneq ($(call bin_path, tput),)
-  TERM_COLUMNS=$(shell echo $$((`tput cols`-4)))
+  TERM_COLUMNS=$(shell if c=`tput cols`; then echo $$(($$c-4)); else echo 76; fi)
 else
   TERM_COLUMNS=76
 endif
diff --git a/SP/Makefile b/SP/Makefile
index ceceaac..8180a49 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -1288,7 +1288,7 @@ release:
 	  CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
 
 ifneq ($(call bin_path, tput),)
-  TERM_COLUMNS=$(shell echo $$((`tput cols`-4)))
+  TERM_COLUMNS=$(shell if c=`tput cols`; then echo $$(($$c-4)); else echo 76; fi)
 else
   TERM_COLUMNS=76
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git