From 9a2451af0bc086635d9ad16468a3d30de4f5e86f Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Mon, 15 Sep 2014 09:30:40 -0400 Subject: * main.c, NEWS, doc/make.text: Rename MAKE_TTY* to MAKE_TERM* --- main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'main.c') 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. */ -- cgit v1.2.3