summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2014-09-15 09:30:40 -0400
committerPaul Smith <psmith@gnu.org>2014-09-15 09:30:40 -0400
commit9a2451af0bc086635d9ad16468a3d30de4f5e86f (patch)
treef8f7ac6fcf0bfcdcc6c1086cac33fbcc407d5ca6 /main.c
parent7f9ce6e97bd1bb4289477ac76532e156947e7865 (diff)
downloadgunmake-9a2451af0bc086635d9ad16468a3d30de4f5e86f.tar.gz
* main.c, NEWS, doc/make.text: Rename MAKE_TTY* to MAKE_TERM*
Diffstat (limited to 'main.c')
-rw-r--r--main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/main.c b/main.c
index 4a79b60..09fb1fb 100644
--- a/main.c
+++ b/main.c
@@ -1400,12 +1400,14 @@ main (int argc, char **argv, char **envp)
/* Set a variable specifying whether stdout/stdin is hooked to a TTY. */
#ifdef HAVE_ISATTY
if (isatty (fileno (stdout)))
- define_variable_cname ("MAKE_TTYOUT", TTYNAME (fileno (stdout)),
- o_default, 0)->export = v_export;
+ if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT")))
+ define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)),
+ o_default, 0)->export = v_export;
if (isatty (fileno (stderr)))
- define_variable_cname ("MAKE_TTYERR", TTYNAME (fileno (stderr)),
- o_default, 0)->export = v_export;
+ if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR")))
+ define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)),
+ o_default, 0)->export = v_export;
#endif
/* Reset in case the switches changed our minds. */