From a7147039ee805f9872de02dfb6d640f38178a435 Mon Sep 17 00:00:00 2001
From: Landon Curt Noll <github-mail@asthe.com>
Date: Sun, 17 Sep 2006 16:52:33 -0700
Subject: [PATCH] Release calc version 2.12.1.1

---
 CHANGES   |   97 ++--
 Makefile  | 1566 ++++++++++++++++++++++++++---------------------------
 version.c |    6 +-
 3 files changed, 834 insertions(+), 835 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7a8a2d8..1c98044 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,13 @@
-The following are the changes from calc version 2.12.0 to date:
+The following are the changes from calc version 2.12.1 to date:
+
+    Fixed minor typos in the 'version 2.12.0 to 2.12.0.8' section below.
+    Made minor formatting changes as well.
+
+    Changed use of ${Q} in the Makefile to avoid an make "feature"
+    related to OpenBSD.
+
+
+The following are the changes from calc version 2.12.0 to 2.12.0.8:
 
     Fixed ellip.cal to deal with a calc syntax change that happened
     many ages ago but was never applied to this file until now.
@@ -109,34 +118,34 @@ The following are the changes from calc version 2.12.0 to date:
     <ebowen at une dot edu dot au>, the dotest evaluates individual
     lines from a file.  The dotest() function takes 1 to 3 arguments:
 
-    dotest(dotest_file [,dotest_code [,dotest_maxcond]])
+	dotest(dotest_file [,dotest_code [,dotest_maxcond]])
 
-    dotest_file
+	dotest_file
 
-        Search along CALCPATH for dotest_file, which contains lines that
-        should evaluate to 1.  Comment lines and empty lines are ignored.
-        Comment lines should use ## instead of the multi like /* ... */
-        because lines are evaluated one line at a time.
+	    Search along CALCPATH for dotest_file, which contains lines that
+	    should evaluate to 1.  Comment lines and empty lines are ignored.
+	    Comment lines should use ## instead of the multi like /* ... */
+	    because lines are evaluated one line at a time.
 
-    dotest_code
+	dotest_code
 
-        Assign the code number that is to be printed at the start of
-        each non-error line and after **** in each error line.
-        The default code number is 999.
+	    Assign the code number that is to be printed at the start of
+	    each non-error line and after **** in each error line.
+	    The default code number is 999.
 
-    dotest_maxcond
+	dotest_maxcond
 
-        The maximum number of error conditions that may be detected.
-        An error condition is not a sign of a problem, in some cases
-        a line deliberately forces an error condition.  A value of -1,
-        the default, implies a maximum of 2147483647.
+	    The maximum number of error conditions that may be detected.
+	    An error condition is not a sign of a problem, in some cases
+	    a line deliberately forces an error condition.  A value of -1,
+	    the default, implies a maximum of 2147483647.
 
-    Global variables and functions must be declared ahead of time because
-    the dotest scope of evaluation is a line at a time.  For example:
+	Global variables and functions must be declared ahead of time because
+	the dotest scope of evaluation is a line at a time.  For example:
 
-        ; read dotest.cal
-        ; read set8700.cal
-        ; dotest("set8700.line");
+	    ; read dotest.cal
+	    ; read set8700.cal
+	    ; dotest("set8700.line");
 
     Updated the todo / wish list items.  The top priority now is to
     convert calc to GNU autoconf / configure to build the calc.
@@ -164,7 +173,7 @@ The following are the changes from calc version 2.12.0 to date:
     Made math_error() in math_error.c more robust against a error
     message constant that is too long.
 
-    Made read_bindings() in hist.c more robust against very line bindings
+    Made read_bindings() in hist.c more robust against very long bindings
     config lines.
 
     Made listsort() in listfunc.c and matsort() matfunc.c more robust
@@ -179,8 +188,7 @@ The following are the changes from calc version 2.12.0 to date:
     no other compile errors, only the unterminated comment will stop
     completion of the function being defined.
 
-    Added the reading of more calc resource files to the cal/regress.cal
-    regression test.
+    The cal/regress.cal now reads most of the calc resource files.
 
     The issq() test had a slight performance boost.  A minor note
     was added to the help/issq file.
@@ -192,25 +200,18 @@ The following are the changes from calc version 2.12.0 to date:
     the number of bits in the fundamental base in which calculations
     are performed.  This is a read-only configuration value.
 
-    Calc now permits such as:
-
-    	++*p--       ++*----*++p----
-
+    Calc now will allow syntax such as ++*p-- and  ++*----*++p----
     where p is an lvalue; successful evaluation of course require the
     successive operations to be performed to have operands of appropriate
     types; e.g. in *A, A is usually an lvalue whose current value is a
     pointer. ++ and -- act on lvalues. In the above examples there are
     implied parentheses from the beginning to immediately after p. If
-    there are no pre ++ or -- operations, as in
-
-	**p++
-
-    the implied parentheses are from immediately before p to the end.
+    there are no pre ++ or -- operations, as in **p++.  The implied
+    parentheses are from immediately before p to the end.
 
     Improved the error message when && is used as a prefix operator.
 
-    Changed the help/config file to read like a builtin function
-    help file.
+    Changed the help/config file to read like a builtin function help file.
 
     One can no longer set to 1, or to a value < 0, the config()
     parameters: "mul2", "sq2", "pow2", and "redc2".  These values
@@ -224,10 +225,10 @@ The following are the changes from calc version 2.12.0 to date:
 	config("sq2") == 3388
 	config("pow2") == 176
 
-    These values were determined established on a 1.8GHz AMD 32-bit
-    CPU of ~3406 BogoMIPS by the new resource file:
+	These values were determined established on a 1.8GHz AMD 32-bit
+	CPU of ~3406 BogoMIPS by the new resource file:
 
-        cal/alg_config.cal
+	    cal/alg_config.cal
 
    Regarding the alg_config.cal resource file:
 
@@ -255,7 +256,7 @@ The following are the changes from calc version 2.12.0 to date:
 	inaccuracy in CPU timings will cause the best value returned to
 	differ slightly from run to run.
 
-    See "help resource" for more information on alg_config.cal.
+	See "help resource" for more information on alg_config.cal.
 
     Updated the "help variable" text to reflect the current calc
     use of ` (backquote), * (star), and & (ampersand).
@@ -304,24 +305,22 @@ The following are the changes from calc version 2.12.0 to date:
 	silly to use the same identifier for both a parameter and local
 	variable, it should not be illegal.
 
-    The provision of warnings for possibly questionable programming in
-    function definitions.
+    Added warnings for possibly questionable code in function definitions.
 
     Added config("redecl_warn", boolean) to control if calc issues
     warnings about variables being declared.  The config("redecl_warn")
     value is TRUE by default.
 
     Added config("dupvar_warn", boolean) to control if calc issues
-    warnings about when variable names collide.  Examples of variable name
-    collisions include when:
+    warnings about when variable names collide.  The config("dupvar_warn")
+    value is TRUE by default.  Examples of variable name collisions
+    include when:
 
     	* both local and static variables have the same name
     	* both local and global variables have the same name
     	* both function parameter and local variables have the same name
     	* both function parameter and global variables have the same name
 
-    The config("dupvar_warn") value is TRUE by default.
-
     Fix of a bug which causes some static variables not to be correctly
     unscoped when their identifiers are used in a global declaration.
 
@@ -351,7 +350,7 @@ The following are the changes from calc version 2.12.0 to date:
     	read sumtimes
 	doalltimes(1e6)
 
-    Calc now ignores carrage returns (\r), vertical tabs (\v), and
+    Calc now ignores carriage returns (\r), vertical tabs (\v), and
     form feeds (\f) when token parsing.  Thus users on Windoz systems
     can write files using their \r\n format and users on non-Windoz
     systems can read them without errors.
@@ -359,7 +358,7 @@ The following are the changes from calc version 2.12.0 to date:
     The quomod() builtin function now takes an optional 5th argument
     which controls the rounding mode like config("quomod") does, but
     only for that call.  Now quomod() is in line with quo() and mod()
-    in that the final augument is an optional rounding mode.
+    in that the final argument is an optional rounding mode.
 
     Added a "make uninstall" rule which will attempt to remove everything
     that was installed by a "make install".
@@ -6202,8 +6201,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.86 $
-## @(#) $Id: CHANGES,v 29.86 2006/08/20 16:18:10 chongo Exp $
+## @(#) $Revision: 29.87 $
+## @(#) $Id: CHANGES,v 29.87 2006/09/17 23:50:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57
diff --git a/Makefile b/Makefile
index 5cb2aa6..5632489 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-MAKEFILE_REV= $$Revision: 29.76 $$
-# @(#) $Id: Makefile.ship,v 29.76 2006/06/26 05:46:06 chongo Exp $
+MAKEFILE_REV= $$Revision: 29.77 $$
+# @(#) $Id: Makefile.ship,v 29.77 2006/09/17 23:49:27 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -1326,7 +1326,7 @@ UTIL_PROGS= align32${EXT} fposval${EXT} have_uid_t${EXT} have_const${EXT} \
 
 # The complete list of Makefile vars passed down to custom/Makefile.
 #
-CUSTOM_PASSDOWN= Q="${Q}" \
+CUSTOM_PASSDOWN= Q="${Q} " \
     INCDIR="${INCDIR}" \
     BINDIR="${BINDIR}" \
     LIBDIR="${LIBDIR}" \
@@ -1362,7 +1362,7 @@ CUSTOM_PASSDOWN= Q="${Q}" \
 
 # The complete list of Makefile vars passed down to sample/Makefile.
 #
-SAMPLE_PASSDOWN= Q="${Q}" \
+SAMPLE_PASSDOWN= Q="${Q} " \
     INCDIR="${INCDIR}" \
     BINDIR="${BINDIR}" \
     LIBDIR="${LIBDIR}" \
@@ -1399,7 +1399,7 @@ SAMPLE_PASSDOWN= Q="${Q}" \
 
 # The compelte list of Makefile vars passed down to help/Makefile.
 #
-HELP_PASSDOWN= Q="${Q}" \
+HELP_PASSDOWN= Q="${Q} " \
     INCDIR="${INCDIR}" \
     BINDIR="${BINDIR}" \
     LIBDIR="${LIBDIR}" \
@@ -1424,7 +1424,7 @@ HELP_PASSDOWN= Q="${Q}" \
 
 # The compelte list of Makefile vars passed down to cal/Makefile.
 #
-CAL_PASSDOWN= Q="${Q}" \
+CAL_PASSDOWN= Q="${Q} " \
     INCDIR="${INCDIR}" \
     BINDIR="${BINDIR}" \
     LIBDIR="${LIBDIR}" \
@@ -1443,7 +1443,7 @@ CAL_PASSDOWN= Q="${Q}" \
 
 # The compelte list of Makefile vars passed down to cscript/Makefile.
 #
-CSCRIPT_PASSDOWN= Q="${Q}" \
+CSCRIPT_PASSDOWN= Q="${Q} " \
     INCDIR="${INCDIR}" \
     BINDIR="${BINDIR}" \
     LIBDIR="${LIBDIR}" \
@@ -1593,55 +1593,55 @@ seed.o: seed.c no_implicit.arg ${MAKE_FILE}
 hsrc: ${BUILD_H_SRC} ${BUILD_C_SRC}
 
 .hsrc: ${BUILD_H_SRC} ${BUILD_C_SRC}
-	-${Q}rm -f .hsrc
-	-${Q}touch .hsrc
+	-${Q} rm -f .hsrc
+	-${Q} touch .hsrc
 
 conf.h: ${MAKE_FILE}
-	-${Q}rm -f conf.h
-	${Q}echo 'forming conf.h'
-	${Q}echo '/*' > conf.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> conf.h
-	${Q}echo ' */' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '#if !defined(__CONF_H__)' >> conf.h
-	${Q}echo '#define __CONF_H__' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '/* the default :-separated search path */' >> conf.h
-	${Q}echo '#if !defined(DEFAULTCALCPATH)' >> conf.h
-	${Q}echo '#define DEFAULTCALCPATH "${CALCPATH}"' >> conf.h
-	${Q}echo '#endif /* DEFAULTCALCPATH */' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '/* the default :-separated startup file list */' >> conf.h
-	${Q}echo '#if !defined(DEFAULTCALCRC)' >> conf.h
-	${Q}echo '#define DEFAULTCALCRC "${CALCRC}"' >> conf.h
-	${Q}echo '#endif /* DEFAULTCALCRC */' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '/* the location of the help directory */' >> conf.h
-	${Q}echo '#if !defined(HELPDIR)' >> conf.h
-	${Q}echo '#define HELPDIR "${HELPDIR}"' >> conf.h
-	${Q}echo '#endif /* HELPDIR */' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '/* the location of the custom help directory */' >> conf.h
-	${Q}echo '#if !defined(CUSTOMHELPDIR)' >> conf.h
-	${Q}echo '#define CUSTOMHELPDIR "${CUSTOMHELPDIR}"' >> conf.h
-	${Q}echo '#endif /* CUSTOMHELPDIR */' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '/* the default pager to use */' >> conf.h
-	${Q}echo '#if !defined(DEFAULTCALCPAGER)' >> conf.h
-	${Q}echo '#define DEFAULTCALCPAGER "${CALCPAGER}"' >> conf.h
-	${Q}echo '#endif /* DEFAULTCALCPAGER */' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '/* where the echo command is located */' >> conf.h
-	${Q}echo '#if !defined(ECHO_PROG)' >> conf.h
-	${Q}echo '#define ECHO_PROG "${ECHO}"' >> conf.h
-	${Q}echo '#endif /* ECHO_PROG */' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '' >> conf.h
-	${Q}echo '#endif /* !__CONF_H__ */' >> conf.h
-	${Q}echo 'conf.h formed'
-	-@if [ -z "${Q}" ]; then \
+	-${Q} rm -f conf.h
+	${Q} echo 'forming conf.h'
+	${Q} echo '/*' > conf.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> conf.h
+	${Q} echo ' */' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '#if !defined(__CONF_H__)' >> conf.h
+	${Q} echo '#define __CONF_H__' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '/* the default :-separated search path */' >> conf.h
+	${Q} echo '#if !defined(DEFAULTCALCPATH)' >> conf.h
+	${Q} echo '#define DEFAULTCALCPATH "${CALCPATH}"' >> conf.h
+	${Q} echo '#endif /* DEFAULTCALCPATH */' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '/* the default :-separated startup file list */' >> conf.h
+	${Q} echo '#if !defined(DEFAULTCALCRC)' >> conf.h
+	${Q} echo '#define DEFAULTCALCRC "${CALCRC}"' >> conf.h
+	${Q} echo '#endif /* DEFAULTCALCRC */' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '/* the location of the help directory */' >> conf.h
+	${Q} echo '#if !defined(HELPDIR)' >> conf.h
+	${Q} echo '#define HELPDIR "${HELPDIR}"' >> conf.h
+	${Q} echo '#endif /* HELPDIR */' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '/* the location of the custom help directory */' >> conf.h
+	${Q} echo '#if !defined(CUSTOMHELPDIR)' >> conf.h
+	${Q} echo '#define CUSTOMHELPDIR "${CUSTOMHELPDIR}"' >> conf.h
+	${Q} echo '#endif /* CUSTOMHELPDIR */' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '/* the default pager to use */' >> conf.h
+	${Q} echo '#if !defined(DEFAULTCALCPAGER)' >> conf.h
+	${Q} echo '#define DEFAULTCALCPAGER "${CALCPAGER}"' >> conf.h
+	${Q} echo '#endif /* DEFAULTCALCPAGER */' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '/* where the echo command is located */' >> conf.h
+	${Q} echo '#if !defined(ECHO_PROG)' >> conf.h
+	${Q} echo '#define ECHO_PROG "${ECHO}"' >> conf.h
+	${Q} echo '#endif /* ECHO_PROG */' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '' >> conf.h
+	${Q} echo '#endif /* !__CONF_H__ */' >> conf.h
+	${Q} echo 'conf.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -1652,19 +1652,19 @@ conf.h: ${MAKE_FILE}
 	fi
 
 endian_calc.h: endian${EXT} ${MAKE_FILE}
-	-${Q}rm -f endian_calc.h
-	${Q}echo 'forming endian_calc.h'
-	${Q}echo '/*' > endian_calc.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> endian_calc.h
-	${Q}echo ' */' >> endian_calc.h
-	${Q}echo '' >> endian_calc.h
-	${Q}echo '' >> endian_calc.h
-	${Q}echo '#if !defined(__ENDIAN_CALC_H__)' >> endian_calc.h
-	${Q}echo '#define __ENDIAN_CALC_H__' >> endian_calc.h
-	${Q}echo '' >> endian_calc.h
-	${Q}echo '' >> endian_calc.h
-	${Q}echo '/* what byte order are we? */' >> endian_calc.h
-	-${Q}if [ X"${BYTE_ORDER}" = X ]; then \
+	-${Q} rm -f endian_calc.h
+	${Q} echo 'forming endian_calc.h'
+	${Q} echo '/*' > endian_calc.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> endian_calc.h
+	${Q} echo ' */' >> endian_calc.h
+	${Q} echo '' >> endian_calc.h
+	${Q} echo '' >> endian_calc.h
+	${Q} echo '#if !defined(__ENDIAN_CALC_H__)' >> endian_calc.h
+	${Q} echo '#define __ENDIAN_CALC_H__' >> endian_calc.h
+	${Q} echo '' >> endian_calc.h
+	${Q} echo '' >> endian_calc.h
+	${Q} echo '/* what byte order are we? */' >> endian_calc.h
+	-${Q} if [ X"${BYTE_ORDER}" = X ]; then \
 	    if [ -f ${INCDIR}/endian.h ]; then \
 		echo '#include <endian.h>' >> endian_calc.h; \
 		echo '#define CALC_BYTE_ORDER BYTE_ORDER' >> endian_calc.h; \
@@ -1689,11 +1689,11 @@ endian_calc.h: endian${EXT} ${MAKE_FILE}
 	else \
 	    ./endian${EXT} >> endian_calc.h; \
 	fi
-	${Q}echo '' >> endian_calc.h
-	${Q}echo '' >> endian_calc.h
-	${Q}echo '#endif /* !__ENDIAN_CALC_H__ */' >> endian_calc.h
-	${Q}echo 'endian_calc.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> endian_calc.h
+	${Q} echo '' >> endian_calc.h
+	${Q} echo '#endif /* !__ENDIAN_CALC_H__ */' >> endian_calc.h
+	${Q} echo 'endian_calc.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -1704,23 +1704,23 @@ endian_calc.h: endian${EXT} ${MAKE_FILE}
 	fi
 
 longbits.h: longbits${EXT} ${MAKE_FILE}
-	-${Q}rm -f longbits.h
-	${Q}echo 'forming longbits.h'
-	${Q}echo '/*' > longbits.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> longbits.h
-	${Q}echo ' */' >> longbits.h
-	${Q}echo '' >> longbits.h
-	${Q}echo '' >> longbits.h
-	${Q}echo '#if !defined(__LONGBITS_H__)' >> longbits.h
-	${Q}echo '#define __LONGBITS_H__' >> longbits.h
-	${Q}echo '' >> longbits.h
-	${Q}echo '' >> longbits.h
-	${Q}./longbits${EXT} ${LONG_BITS} >> longbits.h
-	${Q}echo '' >> longbits.h
-	${Q}echo '' >> longbits.h
-	${Q}echo '#endif /* !__LONGBITS_H__ */' >> longbits.h
-	${Q}echo 'longbits.h formed'
-	-@if [ -z "${Q}" ]; then \
+	-${Q} rm -f longbits.h
+	${Q} echo 'forming longbits.h'
+	${Q} echo '/*' > longbits.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> longbits.h
+	${Q} echo ' */' >> longbits.h
+	${Q} echo '' >> longbits.h
+	${Q} echo '' >> longbits.h
+	${Q} echo '#if !defined(__LONGBITS_H__)' >> longbits.h
+	${Q} echo '#define __LONGBITS_H__' >> longbits.h
+	${Q} echo '' >> longbits.h
+	${Q} echo '' >> longbits.h
+	${Q} ./longbits${EXT} ${LONG_BITS} >> longbits.h
+	${Q} echo '' >> longbits.h
+	${Q} echo '' >> longbits.h
+	${Q} echo '#endif /* !__LONGBITS_H__ */' >> longbits.h
+	${Q} echo 'longbits.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -1731,19 +1731,19 @@ longbits.h: longbits${EXT} ${MAKE_FILE}
 	fi
 
 have_malloc.h: ${MAKE_FILE}
-	-${Q}rm -f have_malloc.h
-	${Q}echo 'forming have_malloc.h'
-	${Q}echo '/*' > have_malloc.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_malloc.h
-	${Q}echo ' */' >> have_malloc.h
-	${Q}echo '' >> have_malloc.h
-	${Q}echo '' >> have_malloc.h
-	${Q}echo '#if !defined(__HAVE_MALLOC_H__)' >> have_malloc.h
-	${Q}echo '#define __HAVE_MALLOC_H__' >> have_malloc.h
-	${Q}echo '' >> have_malloc.h
-	${Q}echo '' >> have_malloc.h
-	${Q}echo '/* do we have <malloc.h>? */' >> have_malloc.h
-	-${Q}if [ X"${HAVE_MALLOC_H}" = X"YES" ]; then \
+	-${Q} rm -f have_malloc.h
+	${Q} echo 'forming have_malloc.h'
+	${Q} echo '/*' > have_malloc.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_malloc.h
+	${Q} echo ' */' >> have_malloc.h
+	${Q} echo '' >> have_malloc.h
+	${Q} echo '' >> have_malloc.h
+	${Q} echo '#if !defined(__HAVE_MALLOC_H__)' >> have_malloc.h
+	${Q} echo '#define __HAVE_MALLOC_H__' >> have_malloc.h
+	${Q} echo '' >> have_malloc.h
+	${Q} echo '' >> have_malloc.h
+	${Q} echo '/* do we have <malloc.h>? */' >> have_malloc.h
+	-${Q} if [ X"${HAVE_MALLOC_H}" = X"YES" ]; then \
 	    echo '#define HAVE_MALLOC_H	 /* yes */' >> have_malloc.h; \
 	elif [ X"${HAVE_MALLOC_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_MALLOC_H	/* no */' >> have_malloc.h; \
@@ -1754,11 +1754,11 @@ have_malloc.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_MALLOC_H	/* no */' >> have_malloc.h; \
 	fi
-	${Q}echo '' >> have_malloc.h
-	${Q}echo '' >> have_malloc.h
-	${Q}echo '#endif /* !__HAVE_MALLOC_H__ */' >> have_malloc.h
-	${Q}echo 'have_malloc.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_malloc.h
+	${Q} echo '' >> have_malloc.h
+	${Q} echo '#endif /* !__HAVE_MALLOC_H__ */' >> have_malloc.h
+	${Q} echo 'have_malloc.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -1769,19 +1769,19 @@ have_malloc.h: ${MAKE_FILE}
 	fi
 
 have_times.h: ${MAKE_FILE}
-	-${Q}rm -f have_times.h
-	${Q}echo 'forming have_times.h'
-	${Q}echo '/*' > have_times.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_times.h
-	${Q}echo ' */' >> have_times.h
-	${Q}echo '' >> have_times.h
-	${Q}echo '' >> have_times.h
-	${Q}echo '#if !defined(__HAVE_TIMES_H__)' >> have_times.h
-	${Q}echo '#define __HAVE_TIMES_H__' >> have_times.h
-	${Q}echo '' >> have_times.h
-	${Q}echo '' >> have_times.h
-	${Q}echo '/* do we have <times.h>? */' >> have_times.h
-	-${Q}if [ X"${HAVE_TIMES_H}" = X"YES" ]; then \
+	-${Q} rm -f have_times.h
+	${Q} echo 'forming have_times.h'
+	${Q} echo '/*' > have_times.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_times.h
+	${Q} echo ' */' >> have_times.h
+	${Q} echo '' >> have_times.h
+	${Q} echo '' >> have_times.h
+	${Q} echo '#if !defined(__HAVE_TIMES_H__)' >> have_times.h
+	${Q} echo '#define __HAVE_TIMES_H__' >> have_times.h
+	${Q} echo '' >> have_times.h
+	${Q} echo '' >> have_times.h
+	${Q} echo '/* do we have <times.h>? */' >> have_times.h
+	-${Q} if [ X"${HAVE_TIMES_H}" = X"YES" ]; then \
 	    echo '#define HAVE_TIMES_H	/* yes */' >> have_times.h; \
 	elif [ X"${HAVE_TIMES_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_TIMES_H  /* no */' >> have_times.h; \
@@ -1792,7 +1792,7 @@ have_times.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_TIMES_H  /* no */' >> have_times.h; \
 	fi
-	-${Q}if [ X"${HAVE_SYS_TIMES_H}" = X"YES" ]; then \
+	-${Q} if [ X"${HAVE_SYS_TIMES_H}" = X"YES" ]; then \
 	    echo '#define HAVE_SYS_TIMES_H	/* yes */' >> have_times.h; \
 	elif [ X"${HAVE_SYS_TIMES_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_SYS_TIMES_H  /* no */' >> have_times.h; \
@@ -1803,7 +1803,7 @@ have_times.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_SYS_TIMES_H  /* no */' >> have_times.h; \
 	fi
-	-${Q}if [ X"${HAVE_TIME_H}" = X"YES" ]; then \
+	-${Q} if [ X"${HAVE_TIME_H}" = X"YES" ]; then \
 	    echo '#define HAVE_TIME_H	/* yes */' >> have_times.h; \
 	elif [ X"${HAVE_TIME_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_TIME_H  /* no */' >> have_times.h; \
@@ -1814,7 +1814,7 @@ have_times.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_TIME_H  /* no */' >> have_times.h; \
 	fi
-	-${Q}if [ X"${HAVE_SYS_TIME_H}" = X"YES" ]; then \
+	-${Q} if [ X"${HAVE_SYS_TIME_H}" = X"YES" ]; then \
 	    echo '#define HAVE_SYS_TIME_H	/* yes */' >> have_times.h; \
 	elif [ X"${HAVE_SYS_TIME_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_SYS_TIME_H  /* no */' >> have_times.h; \
@@ -1825,11 +1825,11 @@ have_times.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_SYS_TIME_H  /* no */' >> have_times.h; \
 	fi
-	${Q}echo '' >> have_times.h
-	${Q}echo '' >> have_times.h
-	${Q}echo '#endif /* !__HAVE_TIMES_H__ */' >> have_times.h
-	${Q}echo 'have_times.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_times.h
+	${Q} echo '' >> have_times.h
+	${Q} echo '#endif /* !__HAVE_TIMES_H__ */' >> have_times.h
+	${Q} echo 'have_times.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -1840,19 +1840,19 @@ have_times.h: ${MAKE_FILE}
 	fi
 
 have_stdlib.h: ${MAKE_FILE}
-	-${Q}rm -f have_stdlib.h
-	${Q}echo 'forming have_stdlib.h'
-	${Q}echo '/*' > have_stdlib.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_stdlib.h
-	${Q}echo ' */' >> have_stdlib.h
-	${Q}echo '' >> have_stdlib.h
-	${Q}echo '' >> have_stdlib.h
-	${Q}echo '#if !defined(__HAVE_STDLIB_H__)' >> have_stdlib.h
-	${Q}echo '#define __HAVE_STDLIB_H__' >> have_stdlib.h
-	${Q}echo '' >> have_stdlib.h
-	${Q}echo '' >> have_stdlib.h
-	${Q}echo '/* do we have <stdlib.h>? */' >> have_stdlib.h
-	-${Q}if [ X"${HAVE_STDLIB_H}" = X"YES" ]; then \
+	-${Q} rm -f have_stdlib.h
+	${Q} echo 'forming have_stdlib.h'
+	${Q} echo '/*' > have_stdlib.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_stdlib.h
+	${Q} echo ' */' >> have_stdlib.h
+	${Q} echo '' >> have_stdlib.h
+	${Q} echo '' >> have_stdlib.h
+	${Q} echo '#if !defined(__HAVE_STDLIB_H__)' >> have_stdlib.h
+	${Q} echo '#define __HAVE_STDLIB_H__' >> have_stdlib.h
+	${Q} echo '' >> have_stdlib.h
+	${Q} echo '' >> have_stdlib.h
+	${Q} echo '/* do we have <stdlib.h>? */' >> have_stdlib.h
+	-${Q} if [ X"${HAVE_STDLIB_H}" = X"YES" ]; then \
 	    echo '#define HAVE_STDLIB_H	/* yes */' >> have_stdlib.h; \
 	elif [ X"${HAVE_STDLIB_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_STDLIB_H  /* no */' >> have_stdlib.h; \
@@ -1863,11 +1863,11 @@ have_stdlib.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_STDLIB_H	/* no */' >> have_stdlib.h; \
 	fi
-	${Q}echo '' >> have_stdlib.h
-	${Q}echo '' >> have_stdlib.h
-	${Q}echo '#endif /* !__HAVE_STDLIB_H__ */' >> have_stdlib.h
-	${Q}echo 'have_stdlib.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_stdlib.h
+	${Q} echo '' >> have_stdlib.h
+	${Q} echo '#endif /* !__HAVE_STDLIB_H__ */' >> have_stdlib.h
+	${Q} echo 'have_stdlib.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -1878,19 +1878,19 @@ have_stdlib.h: ${MAKE_FILE}
 	fi
 
 have_unistd.h: ${MAKE_FILE}
-	-${Q}rm -f have_unistd.h
-	${Q}echo 'forming have_unistd.h'
-	${Q}echo '/*' > have_unistd.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_unistd.h
-	${Q}echo ' */' >> have_unistd.h
-	${Q}echo '' >> have_unistd.h
-	${Q}echo '' >> have_unistd.h
-	${Q}echo '#if !defined(__HAVE_UNISTD_H__)' >> have_unistd.h
-	${Q}echo '#define __HAVE_UNISTD_H__' >> have_unistd.h
-	${Q}echo '' >> have_unistd.h
-	${Q}echo '' >> have_unistd.h
-	${Q}echo '/* do we have <unistd.h>? */' >> have_unistd.h
-	-${Q}if [ X"${HAVE_UNISTD_H}" = X"YES" ]; then \
+	-${Q} rm -f have_unistd.h
+	${Q} echo 'forming have_unistd.h'
+	${Q} echo '/*' > have_unistd.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_unistd.h
+	${Q} echo ' */' >> have_unistd.h
+	${Q} echo '' >> have_unistd.h
+	${Q} echo '' >> have_unistd.h
+	${Q} echo '#if !defined(__HAVE_UNISTD_H__)' >> have_unistd.h
+	${Q} echo '#define __HAVE_UNISTD_H__' >> have_unistd.h
+	${Q} echo '' >> have_unistd.h
+	${Q} echo '' >> have_unistd.h
+	${Q} echo '/* do we have <unistd.h>? */' >> have_unistd.h
+	-${Q} if [ X"${HAVE_UNISTD_H}" = X"YES" ]; then \
 	    echo '#define HAVE_UNISTD_H	/* yes */' >> have_unistd.h; \
 	elif [ X"${HAVE_UNISTD_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_UNISTD_H  /* no */' >> have_unistd.h; \
@@ -1901,11 +1901,11 @@ have_unistd.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_UNISTD_H	/* no */' >> have_unistd.h; \
 	fi
-	${Q}echo '' >> have_unistd.h
-	${Q}echo '' >> have_unistd.h
-	${Q}echo '#endif /* !__HAVE_UNISTD_H__ */' >> have_unistd.h
-	${Q}echo 'have_unistd.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_unistd.h
+	${Q} echo '' >> have_unistd.h
+	${Q} echo '#endif /* !__HAVE_UNISTD_H__ */' >> have_unistd.h
+	${Q} echo 'have_unistd.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -1916,19 +1916,19 @@ have_unistd.h: ${MAKE_FILE}
 	fi
 
 have_string.h: ${MAKE_FILE}
-	-${Q}rm -f have_string.h
-	${Q}echo 'forming have_string.h'
-	${Q}echo '/*' > have_string.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_string.h
-	${Q}echo ' */' >> have_string.h
-	${Q}echo '' >> have_string.h
-	${Q}echo '' >> have_string.h
-	${Q}echo '#if !defined(__HAVE_STRING_H__)' >> have_string.h
-	${Q}echo '#define __HAVE_STRING_H__' >> have_string.h
-	${Q}echo '' >> have_string.h
-	${Q}echo '' >> have_string.h
-	${Q}echo '/* do we have <string.h>? */' >> have_string.h
-	-${Q}if [ X"${HAVE_STRING_H}" = X"YES" ]; then \
+	-${Q} rm -f have_string.h
+	${Q} echo 'forming have_string.h'
+	${Q} echo '/*' > have_string.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_string.h
+	${Q} echo ' */' >> have_string.h
+	${Q} echo '' >> have_string.h
+	${Q} echo '' >> have_string.h
+	${Q} echo '#if !defined(__HAVE_STRING_H__)' >> have_string.h
+	${Q} echo '#define __HAVE_STRING_H__' >> have_string.h
+	${Q} echo '' >> have_string.h
+	${Q} echo '' >> have_string.h
+	${Q} echo '/* do we have <string.h>? */' >> have_string.h
+	-${Q} if [ X"${HAVE_STRING_H}" = X"YES" ]; then \
 	    echo '#define HAVE_STRING_H	/* yes */' >> have_string.h; \
 	elif [ X"${HAVE_STRING_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_STRING_H  /* no */' >> have_string.h; \
@@ -1939,11 +1939,11 @@ have_string.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_STRING_H	/* no */' >> have_string.h; \
 	fi
-	${Q}echo '' >> have_string.h
-	${Q}echo '' >> have_string.h
-	${Q}echo '#endif /* !__HAVE_STRING_H__ */' >> have_string.h
-	${Q}echo 'have_string.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_string.h
+	${Q} echo '' >> have_string.h
+	${Q} echo '#endif /* !__HAVE_STRING_H__ */' >> have_string.h
+	${Q} echo 'have_string.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -1954,22 +1954,22 @@ have_string.h: ${MAKE_FILE}
 	fi
 
 terminal.h: ${MAKE_FILE}
-	-${Q}rm -f terminal.h
-	${Q}echo 'forming terminal.h'
-	${Q}echo '/*' > terminal.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> terminal.h
-	${Q}echo ' */' >> terminal.h
-	${Q}echo '' >> terminal.h
-	${Q}echo '' >> terminal.h
-	${Q}echo '#if !defined(__TERMINAL_H__)' >> terminal.h
-	${Q}echo '#define __TERMINAL_H__' >> terminal.h
-	${Q}echo '' >> terminal.h
-	${Q}echo '' >> terminal.h
-	${Q}echo '/* determine the type of terminal interface */' >> terminal.h
-	${Q}echo '#if !defined(USE_TERMIOS)' >> terminal.h
-	${Q}echo '#if !defined(USE_TERMIO)' >> terminal.h
-	${Q}echo '#if !defined(USE_SGTTY)' >> terminal.h
-	-${Q}if [ X"${TERMCONTROL}" = X"-DUSE_WIN32" ]; then \
+	-${Q} rm -f terminal.h
+	${Q} echo 'forming terminal.h'
+	${Q} echo '/*' > terminal.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> terminal.h
+	${Q} echo ' */' >> terminal.h
+	${Q} echo '' >> terminal.h
+	${Q} echo '' >> terminal.h
+	${Q} echo '#if !defined(__TERMINAL_H__)' >> terminal.h
+	${Q} echo '#define __TERMINAL_H__' >> terminal.h
+	${Q} echo '' >> terminal.h
+	${Q} echo '' >> terminal.h
+	${Q} echo '/* determine the type of terminal interface */' >> terminal.h
+	${Q} echo '#if !defined(USE_TERMIOS)' >> terminal.h
+	${Q} echo '#if !defined(USE_TERMIO)' >> terminal.h
+	${Q} echo '#if !defined(USE_SGTTY)' >> terminal.h
+	-${Q} if [ X"${TERMCONTROL}" = X"-DUSE_WIN32" ]; then \
 	    echo '/* windoz, use none of these modes */' >> terminal.h; \
 	    echo '#undef USE_TERMIOS   /* <termios.h> */' >> terminal.h; \
 	    echo '#undef USE_TERMIO    /* <termio.h> */' >> terminal.h; \
@@ -2000,14 +2000,14 @@ terminal.h: ${MAKE_FILE}
 	    echo '#undef USE_TERMIO    /* <termio.h> */' >> terminal.h; \
 	    echo '#define USE_SGTTY    /* <sys/ioctl.h> */' >> terminal.h; \
 	fi
-	${Q}echo '#endif' >> terminal.h
-	${Q}echo '#endif' >> terminal.h
-	${Q}echo '#endif' >> terminal.h
-	${Q}echo '' >> terminal.h
-	${Q}echo '' >> terminal.h
-	${Q}echo '#endif /* !__TERMINAL_H__ */' >> terminal.h
-	${Q}echo 'terminal.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '#endif' >> terminal.h
+	${Q} echo '#endif' >> terminal.h
+	${Q} echo '#endif' >> terminal.h
+	${Q} echo '' >> terminal.h
+	${Q} echo '' >> terminal.h
+	${Q} echo '#endif /* !__TERMINAL_H__ */' >> terminal.h
+	${Q} echo 'terminal.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2018,36 +2018,36 @@ terminal.h: ${MAKE_FILE}
 	fi
 
 have_fpos.h: have_fpos.c ${MAKE_FILE}
-	-${Q}rm -f fpos_tmp have_fpos.h
-	${Q}echo 'forming have_fpos.h'
-	${Q}echo '/*' > have_fpos.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_fpos.h
-	${Q}echo ' */' >> have_fpos.h
-	${Q}echo '' >> have_fpos.h
-	${Q}echo '' >> have_fpos.h
-	${Q}echo '#if !defined(__HAVE_FPOS_H__)' >> have_fpos.h
-	${Q}echo '#define __HAVE_FPOS_H__' >> have_fpos.h
-	${Q}echo '' >> have_fpos.h
-	${Q}echo '' >> have_fpos.h
-	${Q}echo '/* do we have fgetpos & fsetpos functions? */' >> have_fpos.h
-	-${Q}rm -f have_fpos.o have_fpos${EXT}
-	-${Q}${LCC} ${HAVE_FPOS} ${ICFLAGS} have_fpos.c -c >/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_fpos.o -o have_fpos${EXT} >/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_fpos${EXT} > fpos_tmp 2>/dev/null" \
+	-${Q} rm -f fpos_tmp have_fpos.h
+	${Q} echo 'forming have_fpos.h'
+	${Q} echo '/*' > have_fpos.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_fpos.h
+	${Q} echo ' */' >> have_fpos.h
+	${Q} echo '' >> have_fpos.h
+	${Q} echo '' >> have_fpos.h
+	${Q} echo '#if !defined(__HAVE_FPOS_H__)' >> have_fpos.h
+	${Q} echo '#define __HAVE_FPOS_H__' >> have_fpos.h
+	${Q} echo '' >> have_fpos.h
+	${Q} echo '' >> have_fpos.h
+	${Q} echo '/* do we have fgetpos & fsetpos functions? */' >> have_fpos.h
+	-${Q} rm -f have_fpos.o have_fpos${EXT}
+	-${Q} ${LCC} ${HAVE_FPOS} ${ICFLAGS} have_fpos.c -c >/dev/null 2>&1; true
+	-${Q} ${LCC} ${ILDFLAGS} have_fpos.o -o have_fpos${EXT} >/dev/null 2>&1; true
+	-${Q} ${SHELL} -c "./have_fpos${EXT} > fpos_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s fpos_tmp ]; then \
+	-${Q} if [ -s fpos_tmp ]; then \
 	    cat fpos_tmp >> have_fpos.h; \
 	else \
 	    echo '#undef HAVE_FPOS  /* no */' >> have_fpos.h; \
 	    echo '' >> have_fpos.h; \
 	    echo 'typedef long FILEPOS;' >> have_fpos.h; \
 	fi
-	${Q}echo '' >> have_fpos.h
-	${Q}echo '' >> have_fpos.h
-	${Q}echo '#endif /* !__HAVE_FPOS_H__ */' >> have_fpos.h
-	-${Q}rm -f have_fpos${EXT} have_fpos.o fpos_tmp
-	${Q}echo 'have_fpos.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_fpos.h
+	${Q} echo '' >> have_fpos.h
+	${Q} echo '#endif /* !__HAVE_FPOS_H__ */' >> have_fpos.h
+	-${Q} rm -f have_fpos${EXT} have_fpos.o fpos_tmp
+	${Q} echo 'have_fpos.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2058,40 +2058,40 @@ have_fpos.h: have_fpos.c ${MAKE_FILE}
 	fi
 
 have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h ${MAKE_FILE}
-	-${Q}rm -f fpos_tmp have_fpos_pos.h
-	${Q}echo 'forming have_fpos_pos.h'
-	${Q}echo '/*' > have_fpos_pos.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' \
+	-${Q} rm -f fpos_tmp have_fpos_pos.h
+	${Q} echo 'forming have_fpos_pos.h'
+	${Q} echo '/*' > have_fpos_pos.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' \
 		>> have_fpos_pos.h
-	${Q}echo ' */' >> have_fpos_pos.h
-	${Q}echo '' >> have_fpos_pos.h
-	${Q}echo '' >> have_fpos_pos.h
-	${Q}echo '#if !defined(__HAVE_FPOS_POS_H__)' >> have_fpos_pos.h
-	${Q}echo '#define __HAVE_FPOS_POS_H__' >> have_fpos_pos.h
-	${Q}echo '' >> have_fpos_pos.h
-	${Q}echo '' >> have_fpos_pos.h
-	${Q}echo '/* do we have fgetpos & fsetpos functions? */' \
+	${Q} echo ' */' >> have_fpos_pos.h
+	${Q} echo '' >> have_fpos_pos.h
+	${Q} echo '' >> have_fpos_pos.h
+	${Q} echo '#if !defined(__HAVE_FPOS_POS_H__)' >> have_fpos_pos.h
+	${Q} echo '#define __HAVE_FPOS_POS_H__' >> have_fpos_pos.h
+	${Q} echo '' >> have_fpos_pos.h
+	${Q} echo '' >> have_fpos_pos.h
+	${Q} echo '/* do we have fgetpos & fsetpos functions? */' \
 		>> have_fpos_pos.h
-	-${Q}rm -f have_fpos_pos.o have_fpos_pos${EXT}
-	-${Q}${LCC} ${HAVE_FPOS} ${HAVE_FPOS_POS} \
+	-${Q} rm -f have_fpos_pos.o have_fpos_pos${EXT}
+	-${Q} ${LCC} ${HAVE_FPOS} ${HAVE_FPOS_POS} \
 		    ${ICFLAGS} have_fpos_pos.c -c >/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_fpos_pos.o -o have_fpos_pos${EXT} \
+	-${Q} ${LCC} ${ILDFLAGS} have_fpos_pos.o -o have_fpos_pos${EXT} \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_fpos_pos${EXT} > fpos_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_fpos_pos${EXT} > fpos_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s fpos_tmp ]; then \
+	-${Q} if [ -s fpos_tmp ]; then \
 	    cat fpos_tmp >> have_fpos_pos.h; \
 	else \
 	    echo '#undef HAVE_FPOS_POS  /* no */' >> have_fpos_pos.h; \
 	    echo '' >> have_fpos_pos.h; \
 	    echo '#undef FPOS_POS_BITS' >> have_fpos_pos.h; \
 	fi
-	${Q}echo '' >> have_fpos_pos.h
-	${Q}echo '' >> have_fpos_pos.h
-	${Q}echo '#endif /* !__HAVE_FPOS_POS_H__ */' >> have_fpos_pos.h
-	-${Q}rm -f have_fpos_pos${EXT} have_fpos_pos.o fpos_tmp
-	${Q}echo 'have_fpos_pos.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_fpos_pos.h
+	${Q} echo '' >> have_fpos_pos.h
+	${Q} echo '#endif /* !__HAVE_FPOS_POS_H__ */' >> have_fpos_pos.h
+	-${Q} rm -f have_fpos_pos${EXT} have_fpos_pos.o fpos_tmp
+	${Q} echo 'have_fpos_pos.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2103,30 +2103,30 @@ have_fpos_pos.h: have_fpos_pos.c have_fpos.h have_posscl.h ${MAKE_FILE}
 
 fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
 	   endian_calc.h ${MAKE_FILE}
-	-${Q}rm -f fposv_tmp fposval.h
-	${Q}echo 'forming fposval.h'
-	${Q}echo '/*' > fposval.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> fposval.h
-	${Q}echo ' */' >> fposval.h
-	${Q}echo '' >> fposval.h
-	${Q}echo '' >> fposval.h
-	${Q}echo '#if !defined(__FPOSVAL_H__)' >> fposval.h
-	${Q}echo '#define __FPOSVAL_H__' >> fposval.h
-	${Q}echo '' >> fposval.h
-	${Q}echo '' >> fposval.h
-	${Q}echo '/* what are our file position & size types? */' >> fposval.h
-	-${Q}rm -f fposval.o fposval${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${FPOS_BITS} ${OFF_T_BITS} \
+	-${Q} rm -f fposv_tmp fposval.h
+	${Q} echo 'forming fposval.h'
+	${Q} echo '/*' > fposval.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> fposval.h
+	${Q} echo ' */' >> fposval.h
+	${Q} echo '' >> fposval.h
+	${Q} echo '' >> fposval.h
+	${Q} echo '#if !defined(__FPOSVAL_H__)' >> fposval.h
+	${Q} echo '#define __FPOSVAL_H__' >> fposval.h
+	${Q} echo '' >> fposval.h
+	${Q} echo '' >> fposval.h
+	${Q} echo '/* what are our file position & size types? */' >> fposval.h
+	-${Q} rm -f fposval.o fposval${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${FPOS_BITS} ${OFF_T_BITS} \
 		    ${DEV_BITS} ${INODE_BITS} fposval.c -c >/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} fposval.o -o fposval${EXT} >/dev/null 2>&1; true
-	${Q}${SHELL} -c "./fposval${EXT} fposv_tmp >> fposval.h 2>/dev/null" \
+	-${Q} ${LCC} ${ILDFLAGS} fposval.o -o fposval${EXT} >/dev/null 2>&1; true
+	${Q} ${SHELL} -c "./fposval${EXT} fposv_tmp >> fposval.h 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	${Q}echo '' >> fposval.h
-	${Q}echo '' >> fposval.h
-	${Q}echo '#endif /* !__FPOSVAL_H__ */' >> fposval.h
-	-${Q}rm -f fposval${EXT} fposval.o fposv_tmp
-	${Q}echo 'fposval.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> fposval.h
+	${Q} echo '' >> fposval.h
+	${Q} echo '#endif /* !__FPOSVAL_H__ */' >> fposval.h
+	-${Q} rm -f fposval${EXT} fposval.o fposv_tmp
+	${Q} echo 'fposval.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2137,37 +2137,37 @@ fposval.h: fposval.c have_fpos.h have_fpos_pos.h have_offscl.h have_posscl.h \
 	fi
 
 have_const.h: have_const.c ${MAKE_FILE}
-	-${Q}rm -f have_const const_tmp have_const.h
-	${Q}echo 'forming have_const.h'
-	${Q}echo '/*' > have_const.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_const.h
-	${Q}echo ' */' >> have_const.h
-	${Q}echo '' >> have_const.h
-	${Q}echo '' >> have_const.h
-	${Q}echo '#if !defined(__HAVE_CONST_H__)' >> have_const.h
-	${Q}echo '#define __HAVE_CONST_H__' >> have_const.h
-	${Q}echo '' >> have_const.h
-	${Q}echo '' >> have_const.h
-	${Q}echo '/* do we have or want const? */' >> have_const.h
-	-${Q}rm -f have_const.o have_const${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_CONST} have_const.c -c \
+	-${Q} rm -f have_const const_tmp have_const.h
+	${Q} echo 'forming have_const.h'
+	${Q} echo '/*' > have_const.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_const.h
+	${Q} echo ' */' >> have_const.h
+	${Q} echo '' >> have_const.h
+	${Q} echo '' >> have_const.h
+	${Q} echo '#if !defined(__HAVE_CONST_H__)' >> have_const.h
+	${Q} echo '#define __HAVE_CONST_H__' >> have_const.h
+	${Q} echo '' >> have_const.h
+	${Q} echo '' >> have_const.h
+	${Q} echo '/* do we have or want const? */' >> have_const.h
+	-${Q} rm -f have_const.o have_const${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_CONST} have_const.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_const.o -o have_const${EXT} >/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_const${EXT} > const_tmp 2>/dev/null" \
+	-${Q} ${LCC} ${ILDFLAGS} have_const.o -o have_const${EXT} >/dev/null 2>&1; true
+	-${Q} ${SHELL} -c "./have_const${EXT} > const_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s const_tmp ]; then \
+	-${Q} if [ -s const_tmp ]; then \
 	    cat const_tmp >> have_const.h; \
 	else \
 	    echo '#undef HAVE_CONST /* no */' >> have_const.h; \
 	    echo '#undef CONST' >> have_const.h; \
 	    echo '#define CONST /* no */' >> have_const.h; \
 	fi
-	${Q}echo '' >> have_const.h
-	${Q}echo '' >> have_const.h
-	${Q}echo '#endif /* !__HAVE_CONST_H__ */' >> have_const.h
-	-${Q}rm -f have_const${EXT} have_const.o const_tmp
-	${Q}echo 'have_const.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_const.h
+	${Q} echo '' >> have_const.h
+	${Q} echo '#endif /* !__HAVE_CONST_H__ */' >> have_const.h
+	-${Q} rm -f have_const${EXT} have_const.o const_tmp
+	${Q} echo 'have_const.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2178,36 +2178,36 @@ have_const.h: have_const.c ${MAKE_FILE}
 	fi
 
 have_offscl.h: have_offscl.c ${MAKE_FILE}
-	-${Q}rm -f offscl_tmp have_offscl.h
-	${Q}echo 'forming have_offscl.h'
-	${Q}echo '/*' > have_offscl.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_offscl.h
-	${Q}echo ' */' >> have_offscl.h
-	${Q}echo '' >> have_offscl.h
-	${Q}echo '' >> have_offscl.h
-	${Q}echo '#if !defined(__HAVE_OFFSCL_H__)' >> have_offscl.h
-	${Q}echo '#define __HAVE_OFFSCL_H__' >> have_offscl.h
-	${Q}echo '' >> have_offscl.h
-	${Q}echo '' >> have_offscl.h
-	-${Q}rm -f have_offscl.o have_offscl${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_OFFSCL} have_offscl.c -c \
+	-${Q} rm -f offscl_tmp have_offscl.h
+	${Q} echo 'forming have_offscl.h'
+	${Q} echo '/*' > have_offscl.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_offscl.h
+	${Q} echo ' */' >> have_offscl.h
+	${Q} echo '' >> have_offscl.h
+	${Q} echo '' >> have_offscl.h
+	${Q} echo '#if !defined(__HAVE_OFFSCL_H__)' >> have_offscl.h
+	${Q} echo '#define __HAVE_OFFSCL_H__' >> have_offscl.h
+	${Q} echo '' >> have_offscl.h
+	${Q} echo '' >> have_offscl.h
+	-${Q} rm -f have_offscl.o have_offscl${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_OFFSCL} have_offscl.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_offscl.o -o have_offscl${EXT} \
+	-${Q} ${LCC} ${ILDFLAGS} have_offscl.o -o have_offscl${EXT} \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_offscl${EXT} > offscl_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_offscl${EXT} > offscl_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s offscl_tmp ]; then \
+	-${Q} if [ -s offscl_tmp ]; then \
 	    cat offscl_tmp >> have_offscl.h; \
 	else \
 	    echo '#undef HAVE_OFF_T_SCALAR /* off_t is not a simple value */' \
 		>> have_offscl.h; \
 	fi
-	${Q}echo '' >> have_offscl.h
-	${Q}echo '' >> have_offscl.h
-	${Q}echo '#endif /* !__HAVE_OFFSCL_H__ */' >> have_offscl.h
-	-${Q}rm -f have_offscl${EXT} have_offscl.o offscl_tmp
-	${Q}echo 'have_offscl.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_offscl.h
+	${Q} echo '' >> have_offscl.h
+	${Q} echo '#endif /* !__HAVE_OFFSCL_H__ */' >> have_offscl.h
+	-${Q} rm -f have_offscl${EXT} have_offscl.o offscl_tmp
+	${Q} echo 'have_offscl.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2218,36 +2218,36 @@ have_offscl.h: have_offscl.c ${MAKE_FILE}
 	fi
 
 have_posscl.h: have_posscl.c have_fpos.h ${MAKE_FILE}
-	-${Q}rm -f have_posscl have_posscl.o posscl_tmp have_posscl.h
-	${Q}echo 'forming have_posscl.h'
-	${Q}echo '/*' > have_posscl.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_posscl.h
-	${Q}echo ' */' >> have_posscl.h
-	${Q}echo '' >> have_posscl.h
-	${Q}echo '' >> have_posscl.h
-	${Q}echo '#if !defined(__HAVE_POSSCL_H__)' >> have_posscl.h
-	${Q}echo '#define __HAVE_POSSCL_H__' >> have_posscl.h
-	${Q}echo '' >> have_posscl.h
-	${Q}echo '' >> have_posscl.h
-	-${Q}rm -f have_posscl.o have_posscl
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_POSSCL} have_posscl.c -c \
+	-${Q} rm -f have_posscl have_posscl.o posscl_tmp have_posscl.h
+	${Q} echo 'forming have_posscl.h'
+	${Q} echo '/*' > have_posscl.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_posscl.h
+	${Q} echo ' */' >> have_posscl.h
+	${Q} echo '' >> have_posscl.h
+	${Q} echo '' >> have_posscl.h
+	${Q} echo '#if !defined(__HAVE_POSSCL_H__)' >> have_posscl.h
+	${Q} echo '#define __HAVE_POSSCL_H__' >> have_posscl.h
+	${Q} echo '' >> have_posscl.h
+	${Q} echo '' >> have_posscl.h
+	-${Q} rm -f have_posscl.o have_posscl
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_POSSCL} have_posscl.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_posscl.o -o have_posscl \
+	-${Q} ${LCC} ${ILDFLAGS} have_posscl.o -o have_posscl \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_posscl > posscl_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_posscl > posscl_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s posscl_tmp ]; then \
+	-${Q} if [ -s posscl_tmp ]; then \
 	    cat posscl_tmp >> have_posscl.h; \
 	else \
 	    echo '/* FILEPOS is not a simple value */' >> have_posscl.h; \
 	    echo '#undef HAVE_FILEPOS_SCALAR' >> have_posscl.h; \
 	fi
-	${Q}echo '' >> have_posscl.h
-	${Q}echo '' >> have_posscl.h
-	${Q}echo '#endif /* !__HAVE_POSSCL_H__ */' >> have_posscl.h
-	-${Q}rm -f have_posscl have_posscl.o posscl_tmp
-	${Q}echo 'have_posscl.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_posscl.h
+	${Q} echo '' >> have_posscl.h
+	${Q} echo '#endif /* !__HAVE_POSSCL_H__ */' >> have_posscl.h
+	-${Q} rm -f have_posscl have_posscl.o posscl_tmp
+	${Q} echo 'have_posscl.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2258,31 +2258,31 @@ have_posscl.h: have_posscl.c have_fpos.h ${MAKE_FILE}
 	fi
 
 align32.h: align32.c longbits.h have_unistd.h ${MAKE_FILE}
-	-${Q}rm -f align32 align32_tmp align32.h
-	${Q}echo 'forming align32.h'
-	${Q}echo '/*' > align32.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> align32.h
-	${Q}echo ' */' >> align32.h
-	${Q}echo '' >> align32.h
-	${Q}echo '' >> align32.h
-	${Q}echo '#if !defined(__MUST_ALIGN32_H__)' >> align32.h
-	${Q}echo '#define __MUST_ALIGN32_H__' >> align32.h
-	${Q}echo '' >> align32.h
-	${Q}echo '' >> align32.h
-	${Q}echo '/* must we always align 32 bit accesses? */' >> align32.h
-	-${Q}if [ X"-DMUST_ALIGN32" = X${ALIGN32} ]; then \
+	-${Q} rm -f align32 align32_tmp align32.h
+	${Q} echo 'forming align32.h'
+	${Q} echo '/*' > align32.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> align32.h
+	${Q} echo ' */' >> align32.h
+	${Q} echo '' >> align32.h
+	${Q} echo '' >> align32.h
+	${Q} echo '#if !defined(__MUST_ALIGN32_H__)' >> align32.h
+	${Q} echo '#define __MUST_ALIGN32_H__' >> align32.h
+	${Q} echo '' >> align32.h
+	${Q} echo '' >> align32.h
+	${Q} echo '/* must we always align 32 bit accesses? */' >> align32.h
+	-${Q} if [ X"-DMUST_ALIGN32" = X${ALIGN32} ]; then \
 	    echo '/* forced to align 32 bit values */' >> align32.h; \
 	    echo '#define MUST_ALIGN32' >> align32.h; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ X"-UMUST_ALIGN32" = X${ALIGN32} ]; then \
+	-${Q} if [ X"-UMUST_ALIGN32" = X${ALIGN32} ]; then \
 	    echo '/* forced to not require 32 bit alignment */' >> align32.h; \
 	    echo '#undef MUST_ALIGN32' >> align32.h; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ X = X${ALIGN32} ]; then \
+	-${Q} if [ X = X${ALIGN32} ]; then \
 	    rm -f align32.o align32${EXT}; \
 	    ${LCC} ${ICFLAGS} ${ALIGN32} align32.c -c >/dev/null 2>&1; \
 	    ${LCC} ${ILDFLAGS} align32.o -o align32${EXT} >/dev/null 2>&1; \
@@ -2297,11 +2297,11 @@ align32.h: align32.c longbits.h have_unistd.h ${MAKE_FILE}
 	else \
 	    true; \
 	fi
-	${Q}echo '' >> align32.h
-	${Q}echo '' >> align32.h
-	${Q}echo '#endif /* !__MUST_ALIGN32_H__ */' >> align32.h
-	${Q}echo 'align32.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> align32.h
+	${Q} echo '' >> align32.h
+	${Q} echo '#endif /* !__MUST_ALIGN32_H__ */' >> align32.h
+	${Q} echo 'align32.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2312,35 +2312,35 @@ align32.h: align32.c longbits.h have_unistd.h ${MAKE_FILE}
 	fi
 
 have_uid_t.h: have_uid_t.c have_unistd.h ${MAKE_FILE}
-	-${Q}rm -f have_uid_t uid_tmp have_uid_t.h
-	${Q}echo 'forming have_uid_t.h'
-	${Q}echo '/*' > have_uid_t.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_uid_t.h
-	${Q}echo ' */' >> have_uid_t.h
-	${Q}echo '' >> have_uid_t.h
-	${Q}echo '' >> have_uid_t.h
-	${Q}echo '#if !defined(__HAVE_UID_T_H__)' >> have_uid_t.h
-	${Q}echo '#define __HAVE_UID_T_H__' >> have_uid_t.h
-	${Q}echo '' >> have_uid_t.h
-	${Q}echo '' >> have_uid_t.h
-	${Q}echo '/* do we have or want uid_t? */' >> have_uid_t.h
-	-${Q}rm -f have_uid_t.o have_uid_t${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_UID_T} have_uid_t.c -c \
+	-${Q} rm -f have_uid_t uid_tmp have_uid_t.h
+	${Q} echo 'forming have_uid_t.h'
+	${Q} echo '/*' > have_uid_t.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_uid_t.h
+	${Q} echo ' */' >> have_uid_t.h
+	${Q} echo '' >> have_uid_t.h
+	${Q} echo '' >> have_uid_t.h
+	${Q} echo '#if !defined(__HAVE_UID_T_H__)' >> have_uid_t.h
+	${Q} echo '#define __HAVE_UID_T_H__' >> have_uid_t.h
+	${Q} echo '' >> have_uid_t.h
+	${Q} echo '' >> have_uid_t.h
+	${Q} echo '/* do we have or want uid_t? */' >> have_uid_t.h
+	-${Q} rm -f have_uid_t.o have_uid_t${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_UID_T} have_uid_t.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_uid_t.o -o have_uid_t${EXT} >/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_uid_t${EXT} > uid_tmp 2>/dev/null" \
+	-${Q} ${LCC} ${ILDFLAGS} have_uid_t.o -o have_uid_t${EXT} >/dev/null 2>&1; true
+	-${Q} ${SHELL} -c "./have_uid_t${EXT} > uid_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s uid_tmp ]; then \
+	-${Q} if [ -s uid_tmp ]; then \
 	    cat uid_tmp >> have_uid_t.h; \
 	else \
 	    echo '#undef HAVE_UID_T /* no */' >> have_uid_t.h; \
 	fi
-	${Q}echo '' >> have_uid_t.h
-	${Q}echo '' >> have_uid_t.h
-	${Q}echo '#endif /* !__HAVE_UID_T_H__ */' >> have_uid_t.h
-	-${Q}rm -f have_uid_t${EXT} have_uid_t.o uid_tmp
-	${Q}echo 'have_uid_t.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_uid_t.h
+	${Q} echo '' >> have_uid_t.h
+	${Q} echo '#endif /* !__HAVE_UID_T_H__ */' >> have_uid_t.h
+	-${Q} rm -f have_uid_t${EXT} have_uid_t.o uid_tmp
+	${Q} echo 'have_uid_t.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2351,37 +2351,37 @@ have_uid_t.h: have_uid_t.c have_unistd.h ${MAKE_FILE}
 	fi
 
 have_newstr.h: have_newstr.c ${MAKE_FILE}
-	-${Q}rm -f newstr_tmp have_newstr.h
-	${Q}echo 'forming have_newstr.h'
-	${Q}echo '/*' > have_newstr.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_newstr.h
-	${Q}echo ' */' >> have_newstr.h
-	${Q}echo '' >> have_newstr.h
-	${Q}echo '' >> have_newstr.h
-	${Q}echo '#if !defined(__HAVE_NEWSTR_H__)' >> have_newstr.h
-	${Q}echo '#define __HAVE_NEWSTR_H__' >> have_newstr.h
-	${Q}echo '' >> have_newstr.h
-	${Q}echo '' >> have_newstr.h
-	${Q}echo '/* do we have or want memcpy(), memset() & strchr()? */' \
+	-${Q} rm -f newstr_tmp have_newstr.h
+	${Q} echo 'forming have_newstr.h'
+	${Q} echo '/*' > have_newstr.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_newstr.h
+	${Q} echo ' */' >> have_newstr.h
+	${Q} echo '' >> have_newstr.h
+	${Q} echo '' >> have_newstr.h
+	${Q} echo '#if !defined(__HAVE_NEWSTR_H__)' >> have_newstr.h
+	${Q} echo '#define __HAVE_NEWSTR_H__' >> have_newstr.h
+	${Q} echo '' >> have_newstr.h
+	${Q} echo '' >> have_newstr.h
+	${Q} echo '/* do we have or want memcpy(), memset() & strchr()? */' \
 							>> have_newstr.h
-	-${Q}rm -f have_newstr.o have_newstr${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_NEWSTR} have_newstr.c -c \
+	-${Q} rm -f have_newstr.o have_newstr${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_NEWSTR} have_newstr.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_newstr.o -o have_newstr${EXT} \
+	-${Q} ${LCC} ${ILDFLAGS} have_newstr.o -o have_newstr${EXT} \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_newstr${EXT} > newstr_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_newstr${EXT} > newstr_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s newstr_tmp ]; then \
+	-${Q} if [ -s newstr_tmp ]; then \
 	    cat newstr_tmp >> have_newstr.h; \
 	else \
 	    echo '#undef HAVE_NEWSTR /* no */' >> have_newstr.h; \
 	fi
-	${Q}echo '' >> have_newstr.h
-	${Q}echo '' >> have_newstr.h
-	${Q}echo '#endif /* !__HAVE_NEWSTR_H__ */' >> have_newstr.h
-	-${Q}rm -f have_newstr${EXT} have_newstr.o newstr_tmp
-	${Q}echo 'have_newstr.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_newstr.h
+	${Q} echo '' >> have_newstr.h
+	${Q} echo '#endif /* !__HAVE_NEWSTR_H__ */' >> have_newstr.h
+	-${Q} rm -f have_newstr${EXT} have_newstr.o newstr_tmp
+	${Q} echo 'have_newstr.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2392,36 +2392,36 @@ have_newstr.h: have_newstr.c ${MAKE_FILE}
 	fi
 
 have_memmv.h: have_memmv.c ${MAKE_FILE}
-	-${Q}rm -f have_memmv have_memmv.o memmv_tmp have_memmv.h
-	${Q}echo 'forming have_memmv.h'
-	${Q}echo '/*' > have_memmv.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_memmv.h
-	${Q}echo ' */' >> have_memmv.h
-	${Q}echo '' >> have_memmv.h
-	${Q}echo '' >> have_memmv.h
-	${Q}echo '#if !defined(__HAVE_MEMMV_H__)' >> have_memmv.h
-	${Q}echo '#define __HAVE_MEMMV_H__' >> have_memmv.h
-	${Q}echo '' >> have_memmv.h
-	${Q}echo '' >> have_memmv.h
-	${Q}echo '/* do we have or want memmove()? */' >> have_memmv.h
-	-${Q}rm -f have_memmv.o have_memmv
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_MEMMOVE} have_memmv.c -c \
+	-${Q} rm -f have_memmv have_memmv.o memmv_tmp have_memmv.h
+	${Q} echo 'forming have_memmv.h'
+	${Q} echo '/*' > have_memmv.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_memmv.h
+	${Q} echo ' */' >> have_memmv.h
+	${Q} echo '' >> have_memmv.h
+	${Q} echo '' >> have_memmv.h
+	${Q} echo '#if !defined(__HAVE_MEMMV_H__)' >> have_memmv.h
+	${Q} echo '#define __HAVE_MEMMV_H__' >> have_memmv.h
+	${Q} echo '' >> have_memmv.h
+	${Q} echo '' >> have_memmv.h
+	${Q} echo '/* do we have or want memmove()? */' >> have_memmv.h
+	-${Q} rm -f have_memmv.o have_memmv
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_MEMMOVE} have_memmv.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_memmv.o -o have_memmv \
+	-${Q} ${LCC} ${ILDFLAGS} have_memmv.o -o have_memmv \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_memmv > memmv_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_memmv > memmv_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s memmv_tmp ]; then \
+	-${Q} if [ -s memmv_tmp ]; then \
 	    cat memmv_tmp >> have_memmv.h; \
 	else \
 	    echo '#undef HAVE_MEMMOVE /* no */' >> have_memmv.h; \
 	fi
-	${Q}echo '' >> have_memmv.h
-	${Q}echo '' >> have_memmv.h
-	${Q}echo '#endif /* !__HAVE_MEMMV_H__ */' >> have_memmv.h
-	-${Q}rm -f have_memmv have_memmv.o memmv_tmp
-	${Q}echo 'have_memmv.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_memmv.h
+	${Q} echo '' >> have_memmv.h
+	${Q} echo '#endif /* !__HAVE_MEMMV_H__ */' >> have_memmv.h
+	-${Q} rm -f have_memmv have_memmv.o memmv_tmp
+	${Q} echo 'have_memmv.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2432,36 +2432,36 @@ have_memmv.h: have_memmv.c ${MAKE_FILE}
 	fi
 
 have_ustat.h: have_ustat.c ${MAKE_FILE}
-	-${Q}rm -f ustat_tmp have_ustat.h
-	${Q}echo 'forming have_ustat.h'
-	${Q}echo '/*' > have_ustat.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_ustat.h
-	${Q}echo ' */' >> have_ustat.h
-	${Q}echo '' >> have_ustat.h
-	${Q}echo '' >> have_ustat.h
-	${Q}echo '#if !defined(__HAVE_USTAT_H__)' >> have_ustat.h
-	${Q}echo '#define __HAVE_USTAT_H__' >> have_ustat.h
-	${Q}echo '' >> have_ustat.h
-	${Q}echo '' >> have_ustat.h
-	${Q}echo '/* do we have or want ustat()? */' >> have_ustat.h
-	-${Q}rm -f have_ustat.o have_ustat${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_USTAT} have_ustat.c -c \
+	-${Q} rm -f ustat_tmp have_ustat.h
+	${Q} echo 'forming have_ustat.h'
+	${Q} echo '/*' > have_ustat.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_ustat.h
+	${Q} echo ' */' >> have_ustat.h
+	${Q} echo '' >> have_ustat.h
+	${Q} echo '' >> have_ustat.h
+	${Q} echo '#if !defined(__HAVE_USTAT_H__)' >> have_ustat.h
+	${Q} echo '#define __HAVE_USTAT_H__' >> have_ustat.h
+	${Q} echo '' >> have_ustat.h
+	${Q} echo '' >> have_ustat.h
+	${Q} echo '/* do we have or want ustat()? */' >> have_ustat.h
+	-${Q} rm -f have_ustat.o have_ustat${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_USTAT} have_ustat.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_ustat.o -o have_ustat${EXT} \
+	-${Q} ${LCC} ${ILDFLAGS} have_ustat.o -o have_ustat${EXT} \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_ustat${EXT} > ustat_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_ustat${EXT} > ustat_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s ustat_tmp ]; then \
+	-${Q} if [ -s ustat_tmp ]; then \
 	    cat ustat_tmp >> have_ustat.h; \
 	else \
 	    echo '#undef HAVE_USTAT /* no */' >> have_ustat.h; \
 	fi
-	${Q}echo '' >> have_ustat.h
-	${Q}echo '' >> have_ustat.h
-	${Q}echo '#endif /* !__HAVE_USTAT_H__ */' >> have_ustat.h
-	-${Q}rm -f have_ustat${EXT} have_ustat.o ustat_tmp
-	${Q}echo 'have_ustat.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_ustat.h
+	${Q} echo '' >> have_ustat.h
+	${Q} echo '#endif /* !__HAVE_USTAT_H__ */' >> have_ustat.h
+	-${Q} rm -f have_ustat${EXT} have_ustat.o ustat_tmp
+	${Q} echo 'have_ustat.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2472,36 +2472,36 @@ have_ustat.h: have_ustat.c ${MAKE_FILE}
 	fi
 
 have_getsid.h: have_getsid.c ${MAKE_FILE}
-	-${Q}rm -f getsid_tmp have_getsid.h
-	${Q}echo 'forming have_getsid.h'
-	${Q}echo '/*' > have_getsid.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getsid.h
-	${Q}echo ' */' >> have_getsid.h
-	${Q}echo '' >> have_getsid.h
-	${Q}echo '' >> have_getsid.h
-	${Q}echo '#if !defined(__HAVE_GETSID_H__)' >> have_getsid.h
-	${Q}echo '#define __HAVE_GETSID_H__' >> have_getsid.h
-	${Q}echo '' >> have_getsid.h
-	${Q}echo '' >> have_getsid.h
-	${Q}echo '/* do we have or want getsid()? */' >> have_getsid.h
-	-${Q}rm -f have_getsid.o have_getsid${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETSID} have_getsid.c -c \
+	-${Q} rm -f getsid_tmp have_getsid.h
+	${Q} echo 'forming have_getsid.h'
+	${Q} echo '/*' > have_getsid.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getsid.h
+	${Q} echo ' */' >> have_getsid.h
+	${Q} echo '' >> have_getsid.h
+	${Q} echo '' >> have_getsid.h
+	${Q} echo '#if !defined(__HAVE_GETSID_H__)' >> have_getsid.h
+	${Q} echo '#define __HAVE_GETSID_H__' >> have_getsid.h
+	${Q} echo '' >> have_getsid.h
+	${Q} echo '' >> have_getsid.h
+	${Q} echo '/* do we have or want getsid()? */' >> have_getsid.h
+	-${Q} rm -f have_getsid.o have_getsid${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_GETSID} have_getsid.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_getsid.o -o have_getsid \
+	-${Q} ${LCC} ${ILDFLAGS} have_getsid.o -o have_getsid \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_getsid${EXT} > getsid_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_getsid${EXT} > getsid_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s getsid_tmp ]; then \
+	-${Q} if [ -s getsid_tmp ]; then \
 	    cat getsid_tmp >> have_getsid.h; \
 	else \
 	    echo '#undef HAVE_GETSID /* no */' >> have_getsid.h; \
 	fi
-	${Q}echo '' >> have_getsid.h
-	${Q}echo '' >> have_getsid.h
-	${Q}echo '#endif /* !__HAVE_GETSID_H__ */' >> have_getsid.h
-	-${Q}rm -f have_getsid${EXT} have_getsid.o getsid_tmp
-	${Q}echo 'have_getsid.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_getsid.h
+	${Q} echo '' >> have_getsid.h
+	${Q} echo '#endif /* !__HAVE_GETSID_H__ */' >> have_getsid.h
+	-${Q} rm -f have_getsid${EXT} have_getsid.o getsid_tmp
+	${Q} echo 'have_getsid.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2512,36 +2512,36 @@ have_getsid.h: have_getsid.c ${MAKE_FILE}
 	fi
 
 have_getpgid.h: have_getpgid.c ${MAKE_FILE}
-	-${Q}rm -f getpgid_tmp have_getpgid.h
-	${Q}echo 'forming have_getpgid.h'
-	${Q}echo '/*' > have_getpgid.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getpgid.h
-	${Q}echo ' */' >> have_getpgid.h
-	${Q}echo '' >> have_getpgid.h
-	${Q}echo '' >> have_getpgid.h
-	${Q}echo '#if !defined(__HAVE_GETPGID_H__)' >> have_getpgid.h
-	${Q}echo '#define __HAVE_GETPGID_H__' >> have_getpgid.h
-	${Q}echo '' >> have_getpgid.h
-	${Q}echo '' >> have_getpgid.h
-	${Q}echo '/* do we have or want getpgid()? */' >> have_getpgid.h
-	-${Q}rm -f have_getpgid.o have_getpgid${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETPGID} have_getpgid.c -c \
+	-${Q} rm -f getpgid_tmp have_getpgid.h
+	${Q} echo 'forming have_getpgid.h'
+	${Q} echo '/*' > have_getpgid.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getpgid.h
+	${Q} echo ' */' >> have_getpgid.h
+	${Q} echo '' >> have_getpgid.h
+	${Q} echo '' >> have_getpgid.h
+	${Q} echo '#if !defined(__HAVE_GETPGID_H__)' >> have_getpgid.h
+	${Q} echo '#define __HAVE_GETPGID_H__' >> have_getpgid.h
+	${Q} echo '' >> have_getpgid.h
+	${Q} echo '' >> have_getpgid.h
+	${Q} echo '/* do we have or want getpgid()? */' >> have_getpgid.h
+	-${Q} rm -f have_getpgid.o have_getpgid${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_GETPGID} have_getpgid.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_getpgid.o -o have_getpgid${EXT} \
+	-${Q} ${LCC} ${ILDFLAGS} have_getpgid.o -o have_getpgid${EXT} \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_getpgid${EXT} > getpgid_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_getpgid${EXT} > getpgid_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s getpgid_tmp ]; then \
+	-${Q} if [ -s getpgid_tmp ]; then \
 	    cat getpgid_tmp >> have_getpgid.h; \
 	else \
 	    echo '#undef HAVE_GETPGID /* no */' >> have_getpgid.h; \
 	fi
-	${Q}echo '' >> have_getpgid.h
-	${Q}echo '' >> have_getpgid.h
-	${Q}echo '#endif /* !__HAVE_GETPGID_H__ */' >> have_getpgid.h
-	-${Q}rm -f have_getpgid${EXT} have_getpgid.o getpgid_tmp
-	${Q}echo 'have_getpgid.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_getpgid.h
+	${Q} echo '' >> have_getpgid.h
+	${Q} echo '#endif /* !__HAVE_GETPGID_H__ */' >> have_getpgid.h
+	-${Q} rm -f have_getpgid${EXT} have_getpgid.o getpgid_tmp
+	${Q} echo 'have_getpgid.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2552,36 +2552,36 @@ have_getpgid.h: have_getpgid.c ${MAKE_FILE}
 	fi
 
 have_gettime.h: have_gettime.c ${MAKE_FILE}
-	-${Q}rm -f gettime_tmp have_gettime.h
-	${Q}echo 'forming have_gettime.h'
-	${Q}echo '/*' > have_gettime.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_gettime.h
-	${Q}echo ' */' >> have_gettime.h
-	${Q}echo '' >> have_gettime.h
-	${Q}echo '' >> have_gettime.h
-	${Q}echo '#if !defined(__HAVE_GETTIME_H__)' >> have_gettime.h
-	${Q}echo '#define __HAVE_GETTIME_H__' >> have_gettime.h
-	${Q}echo '' >> have_gettime.h
-	${Q}echo '' >> have_gettime.h
-	${Q}echo '/* do we have or want clock_gettime()? */' >> have_gettime.h
-	-${Q}rm -f have_gettime.o have_gettime${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETTIME} have_gettime.c -c \
+	-${Q} rm -f gettime_tmp have_gettime.h
+	${Q} echo 'forming have_gettime.h'
+	${Q} echo '/*' > have_gettime.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_gettime.h
+	${Q} echo ' */' >> have_gettime.h
+	${Q} echo '' >> have_gettime.h
+	${Q} echo '' >> have_gettime.h
+	${Q} echo '#if !defined(__HAVE_GETTIME_H__)' >> have_gettime.h
+	${Q} echo '#define __HAVE_GETTIME_H__' >> have_gettime.h
+	${Q} echo '' >> have_gettime.h
+	${Q} echo '' >> have_gettime.h
+	${Q} echo '/* do we have or want clock_gettime()? */' >> have_gettime.h
+	-${Q} rm -f have_gettime.o have_gettime${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_GETTIME} have_gettime.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_gettime.o -o have_gettime \
+	-${Q} ${LCC} ${ILDFLAGS} have_gettime.o -o have_gettime \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_gettime${EXT} > gettime_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_gettime${EXT} > gettime_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s gettime_tmp ]; then \
+	-${Q} if [ -s gettime_tmp ]; then \
 	    cat gettime_tmp >> have_gettime.h; \
 	else \
 	    echo '#undef HAVE_GETTIME /* no */' >> have_gettime.h; \
 	fi
-	${Q}echo '' >> have_gettime.h
-	${Q}echo '' >> have_gettime.h
-	${Q}echo '#endif /* !__HAVE_GETTIME_H__ */' >> have_gettime.h
-	-${Q}rm -f have_gettime${EXT} have_gettime.o gettime_tmp
-	${Q}echo 'have_gettime.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_gettime.h
+	${Q} echo '' >> have_gettime.h
+	${Q} echo '#endif /* !__HAVE_GETTIME_H__ */' >> have_gettime.h
+	-${Q} rm -f have_gettime${EXT} have_gettime.o gettime_tmp
+	${Q} echo 'have_gettime.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2592,36 +2592,36 @@ have_gettime.h: have_gettime.c ${MAKE_FILE}
 	fi
 
 have_getprid.h: have_getprid.c ${MAKE_FILE}
-	-${Q}rm -f getprid_tmp have_getprid.h
-	${Q}echo 'forming have_getprid.h'
-	${Q}echo '/*' > have_getprid.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getprid.h
-	${Q}echo ' */' >> have_getprid.h
-	${Q}echo '' >> have_getprid.h
-	${Q}echo '' >> have_getprid.h
-	${Q}echo '#if !defined(__HAVE_GETPRID_H__)' >> have_getprid.h
-	${Q}echo '#define __HAVE_GETPRID_H__' >> have_getprid.h
-	${Q}echo '' >> have_getprid.h
-	${Q}echo '' >> have_getprid.h
-	${Q}echo '/* do we have or want getprid()? */' >> have_getprid.h
-	-${Q}rm -f have_getprid.o have_getprid${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETPRID} have_getprid.c -c \
+	-${Q} rm -f getprid_tmp have_getprid.h
+	${Q} echo 'forming have_getprid.h'
+	${Q} echo '/*' > have_getprid.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_getprid.h
+	${Q} echo ' */' >> have_getprid.h
+	${Q} echo '' >> have_getprid.h
+	${Q} echo '' >> have_getprid.h
+	${Q} echo '#if !defined(__HAVE_GETPRID_H__)' >> have_getprid.h
+	${Q} echo '#define __HAVE_GETPRID_H__' >> have_getprid.h
+	${Q} echo '' >> have_getprid.h
+	${Q} echo '' >> have_getprid.h
+	${Q} echo '/* do we have or want getprid()? */' >> have_getprid.h
+	-${Q} rm -f have_getprid.o have_getprid${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_GETPRID} have_getprid.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_getprid.o -o have_getprid${EXT} \
+	-${Q} ${LCC} ${ILDFLAGS} have_getprid.o -o have_getprid${EXT} \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_getprid${EXT} > getprid_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_getprid${EXT} > getprid_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s getprid_tmp ]; then \
+	-${Q} if [ -s getprid_tmp ]; then \
 	    cat getprid_tmp >> have_getprid.h; \
 	else \
 	    echo '#undef HAVE_GETPRID /* no */' >> have_getprid.h; \
 	fi
-	${Q}echo '' >> have_getprid.h
-	${Q}echo '' >> have_getprid.h
-	${Q}echo '#endif /* !__HAVE_GETPRID_H__ */' >> have_getprid.h
-	-${Q}rm -f have_getprid${EXT} have_getprid.o getprid_tmp
-	${Q}echo 'have_getprid.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_getprid.h
+	${Q} echo '' >> have_getprid.h
+	${Q} echo '#endif /* !__HAVE_GETPRID_H__ */' >> have_getprid.h
+	-${Q} rm -f have_getprid${EXT} have_getprid.o getprid_tmp
+	${Q} echo 'have_getprid.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2632,19 +2632,19 @@ have_getprid.h: have_getprid.c ${MAKE_FILE}
 	fi
 
 have_urandom.h: ${MAKE_FILE}
-	-${Q}rm -f have_urandom.h
-	${Q}echo 'forming have_urandom.h'
-	${Q}echo '/*' > have_urandom.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_urandom.h
-	${Q}echo ' */' >> have_urandom.h
-	${Q}echo '' >> have_urandom.h
-	${Q}echo '' >> have_urandom.h
-	${Q}echo '#if !defined(__HAVE_URANDOM_H__)' >> have_urandom.h
-	${Q}echo '#define __HAVE_URANDOM_H__' >> have_urandom.h
-	${Q}echo '' >> have_urandom.h
-	${Q}echo '' >> have_urandom.h
-	${Q}echo '/* do we have /dev/urandom? */' >> have_urandom.h
-	-${Q}if [ X"${HAVE_URANDOM_H}" = X"YES" ]; then \
+	-${Q} rm -f have_urandom.h
+	${Q} echo 'forming have_urandom.h'
+	${Q} echo '/*' > have_urandom.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_urandom.h
+	${Q} echo ' */' >> have_urandom.h
+	${Q} echo '' >> have_urandom.h
+	${Q} echo '' >> have_urandom.h
+	${Q} echo '#if !defined(__HAVE_URANDOM_H__)' >> have_urandom.h
+	${Q} echo '#define __HAVE_URANDOM_H__' >> have_urandom.h
+	${Q} echo '' >> have_urandom.h
+	${Q} echo '' >> have_urandom.h
+	${Q} echo '/* do we have /dev/urandom? */' >> have_urandom.h
+	-${Q} if [ X"${HAVE_URANDOM_H}" = X"YES" ]; then \
 	    echo '#define HAVE_URANDOM_H	/* yes */' >> have_urandom.h; \
 	elif [ X"${HAVE_URANDOM_H}" = X"NO" ]; then \
 	    echo '#undef HAVE_URANDOM_H  /* no */' >> have_urandom.h; \
@@ -2653,11 +2653,11 @@ have_urandom.h: ${MAKE_FILE}
 	else \
 	    echo '#undef HAVE_URANDOM_H	 /* no */' >> have_urandom.h; \
 	fi
-	${Q}echo '' >> have_urandom.h
-	${Q}echo '' >> have_urandom.h
-	${Q}echo '#endif /* !__HAVE_URANDOM_H__ */' >> have_urandom.h
-	${Q}echo 'have_urandom.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_urandom.h
+	${Q} echo '' >> have_urandom.h
+	${Q} echo '#endif /* !__HAVE_URANDOM_H__ */' >> have_urandom.h
+	${Q} echo 'have_urandom.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2668,36 +2668,36 @@ have_urandom.h: ${MAKE_FILE}
 	fi
 
 have_rusage.h: have_rusage.c ${MAKE_FILE}
-	-${Q}rm -f rusage_tmp have_rusage.h
-	${Q}echo 'forming have_rusage.h'
-	${Q}echo '/*' > have_rusage.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_rusage.h
-	${Q}echo ' */' >> have_rusage.h
-	${Q}echo '' >> have_rusage.h
-	${Q}echo '' >> have_rusage.h
-	${Q}echo '#if !defined(__HAVE_RUSAGE_H__)' >> have_rusage.h
-	${Q}echo '#define __HAVE_RUSAGE_H__' >> have_rusage.h
-	${Q}echo '' >> have_rusage.h
-	${Q}echo '' >> have_rusage.h
-	${Q}echo '/* do we have or want getrusage()? */' >> have_rusage.h
-	-${Q}rm -f have_rusage.o have_rusage${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_GETRUSAGE} have_rusage.c -c \
+	-${Q} rm -f rusage_tmp have_rusage.h
+	${Q} echo 'forming have_rusage.h'
+	${Q} echo '/*' > have_rusage.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_rusage.h
+	${Q} echo ' */' >> have_rusage.h
+	${Q} echo '' >> have_rusage.h
+	${Q} echo '' >> have_rusage.h
+	${Q} echo '#if !defined(__HAVE_RUSAGE_H__)' >> have_rusage.h
+	${Q} echo '#define __HAVE_RUSAGE_H__' >> have_rusage.h
+	${Q} echo '' >> have_rusage.h
+	${Q} echo '' >> have_rusage.h
+	${Q} echo '/* do we have or want getrusage()? */' >> have_rusage.h
+	-${Q} rm -f have_rusage.o have_rusage${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_GETRUSAGE} have_rusage.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_rusage.o -o have_rusage${EXT} \
+	-${Q} ${LCC} ${ILDFLAGS} have_rusage.o -o have_rusage${EXT} \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_rusage${EXT} > rusage_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_rusage${EXT} > rusage_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s rusage_tmp ]; then \
+	-${Q} if [ -s rusage_tmp ]; then \
 	    cat rusage_tmp >> have_rusage.h; \
 	else \
 	    echo '#undef HAVE_GETRUSAGE /* no */' >> have_rusage.h; \
 	fi
-	${Q}echo '' >> have_rusage.h
-	${Q}echo '' >> have_rusage.h
-	${Q}echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_rusage.h
-	-${Q}rm -f have_rusage${EXT} have_rusage.o rusage_tmp
-	${Q}echo 'have_rusage.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_rusage.h
+	${Q} echo '' >> have_rusage.h
+	${Q} echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_rusage.h
+	-${Q} rm -f have_rusage${EXT} have_rusage.o rusage_tmp
+	${Q} echo 'have_rusage.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2708,36 +2708,36 @@ have_rusage.h: have_rusage.c ${MAKE_FILE}
 	fi
 
 have_strdup.h: have_strdup.c ${MAKE_FILE}
-	-${Q}rm -f strdup_tmp have_strdup.h
-	${Q}echo 'forming have_strdup.h'
-	${Q}echo '/*' > have_strdup.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_strdup.h
-	${Q}echo ' */' >> have_strdup.h
-	${Q}echo '' >> have_strdup.h
-	${Q}echo '' >> have_strdup.h
-	${Q}echo '#if !defined(__HAVE_RUSAGE_H__)' >> have_strdup.h
-	${Q}echo '#define __HAVE_RUSAGE_H__' >> have_strdup.h
-	${Q}echo '' >> have_strdup.h
-	${Q}echo '' >> have_strdup.h
-	${Q}echo '/* do we have or want getstrdup()? */' >> have_strdup.h
-	-${Q}rm -f have_strdup.o have_strdup${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_STRDUP} have_strdup.c -c \
+	-${Q} rm -f strdup_tmp have_strdup.h
+	${Q} echo 'forming have_strdup.h'
+	${Q} echo '/*' > have_strdup.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_strdup.h
+	${Q} echo ' */' >> have_strdup.h
+	${Q} echo '' >> have_strdup.h
+	${Q} echo '' >> have_strdup.h
+	${Q} echo '#if !defined(__HAVE_RUSAGE_H__)' >> have_strdup.h
+	${Q} echo '#define __HAVE_RUSAGE_H__' >> have_strdup.h
+	${Q} echo '' >> have_strdup.h
+	${Q} echo '' >> have_strdup.h
+	${Q} echo '/* do we have or want getstrdup()? */' >> have_strdup.h
+	-${Q} rm -f have_strdup.o have_strdup${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_STRDUP} have_strdup.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_strdup.o -o have_strdup \
+	-${Q} ${LCC} ${ILDFLAGS} have_strdup.o -o have_strdup \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_strdup${EXT} > strdup_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_strdup${EXT} > strdup_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s strdup_tmp ]; then \
+	-${Q} if [ -s strdup_tmp ]; then \
 	    cat strdup_tmp >> have_strdup.h; \
 	else \
 	    echo '#undef HAVE_STRDUP /* no */' >> have_strdup.h; \
 	fi
-	${Q}echo '' >> have_strdup.h
-	${Q}echo '' >> have_strdup.h
-	${Q}echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_strdup.h
-	-${Q}rm -f have_strdup${EXT} have_strdup.o strdup_tmp
-	${Q}echo 'have_strdup.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_strdup.h
+	${Q} echo '' >> have_strdup.h
+	${Q} echo '#endif /* !__HAVE_RUSAGE_H__ */' >> have_strdup.h
+	-${Q} rm -f have_strdup${EXT} have_strdup.o strdup_tmp
+	${Q} echo 'have_strdup.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2748,27 +2748,27 @@ have_strdup.h: have_strdup.c ${MAKE_FILE}
 	fi
 
 args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
-	-${Q}rm -f args.h
-	${Q}echo 'forming args.h'
-	${Q}echo '/*' > args.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> args.h
-	${Q}echo ' */' >> args.h
-	${Q}echo '' >> args.h
-	${Q}echo '' >> args.h
-	${Q}echo '#if !defined(__ARGS_H__)' >> args.h
-	${Q}echo '#define __ARGS_H__' >> args.h
-	${Q}echo '' >> args.h
-	${Q}echo '' >> args.h
-	-${Q}rm -f have_stdvs.o have_stdvs${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_VSPRINTF} have_stdvs.c -c \
+	-${Q} rm -f args.h
+	${Q} echo 'forming args.h'
+	${Q} echo '/*' > args.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> args.h
+	${Q} echo ' */' >> args.h
+	${Q} echo '' >> args.h
+	${Q} echo '' >> args.h
+	${Q} echo '#if !defined(__ARGS_H__)' >> args.h
+	${Q} echo '#define __ARGS_H__' >> args.h
+	${Q} echo '' >> args.h
+	${Q} echo '' >> args.h
+	-${Q} rm -f have_stdvs.o have_stdvs${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_VSPRINTF} have_stdvs.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_stdvs.o -o have_stdvs${EXT} >/dev/null 2>&1; true
-	-${Q}if ./have_stdvs${EXT} >>args.h 2>/dev/null; then \
+	-${Q} ${LCC} ${ILDFLAGS} have_stdvs.o -o have_stdvs${EXT} >/dev/null 2>&1; true
+	-${Q} if ./have_stdvs${EXT} >>args.h 2>/dev/null; then \
 	    touch have_args.sh; \
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -f have_args.sh ] && [ X"${HAVE_VSPRINTF}" = X ]; then \
+	-${Q} if [ ! -f have_args.sh ] && [ X"${HAVE_VSPRINTF}" = X ]; then \
 	    rm -f have_stdvs.o have_stdvs${EXT} have_varvs.o have_varvs${EXT}; \
 	    ${LCC} ${ICFLAGS} -DDONT_HAVE_VSPRINTF have_varvs.c -c \
 		    2>/dev/null; \
@@ -2781,7 +2781,7 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	else \
 	    true; \
 	fi
-	-${Q}if [ -f have_args.sh ]; then \
+	-${Q} if [ -f have_args.sh ]; then \
 	    echo 'exit 0' > have_args.sh; \
 	else \
 	    echo 'exit 1' > have_args.sh; \
@@ -2789,13 +2789,13 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	    echo "what type of vsprintf() should be used.  Set or change"; \
 	    echo "the Makefile variable HAVE_VSPRINTF."; \
 	fi
-	${Q}sh ./have_args.sh
-	${Q}echo '' >> args.h
-	${Q}echo '' >> args.h
-	${Q}echo '#endif /* !__ARGS_H__ */' >> args.h
-	-${Q}rm -f have_stdvs.o have_varvs.o have_varvs${EXT} have_args.sh core
-	${Q}echo 'args.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} sh ./have_args.sh
+	${Q} echo '' >> args.h
+	${Q} echo '' >> args.h
+	${Q} echo '#endif /* !__ARGS_H__ */' >> args.h
+	-${Q} rm -f have_stdvs.o have_varvs.o have_varvs${EXT} have_args.sh core
+	${Q} echo 'args.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2806,26 +2806,26 @@ args.h: have_stdvs.c have_varvs.c have_string.h have_unistd.h have_string.h
 	fi
 
 calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE}
-	-${Q}rm -f calerr.h
-	${Q}echo 'forming calcerr.h'
-	${Q}echo '/*' > calcerr.h
-	${Q}echo ' * DO NOT EDIT' >> calcerr.h
-	${Q}echo ' *' >> calcerr.h
-	${Q}echo ' * generated by calcerr.tbl via Makefile' >> calcerr.h
-	${Q}echo ' */' >> calcerr.h
-	${Q}echo '' >> calcerr.h
-	${Q}echo '' >> calcerr.h
-	${Q}echo '#if !defined(__CALCERR_H__)' >> calcerr.h
-	${Q}echo '#define __CALCERR_H__' >> calcerr.h
-	${Q}echo '' >> calcerr.h
-	${Q}echo '' >> calcerr.h
-	${Q}${SED} -f calcerr_h.sed < calcerr.tbl | \
+	-${Q} rm -f calerr.h
+	${Q} echo 'forming calcerr.h'
+	${Q} echo '/*' > calcerr.h
+	${Q} echo ' * DO NOT EDIT' >> calcerr.h
+	${Q} echo ' *' >> calcerr.h
+	${Q} echo ' * generated by calcerr.tbl via Makefile' >> calcerr.h
+	${Q} echo ' */' >> calcerr.h
+	${Q} echo '' >> calcerr.h
+	${Q} echo '' >> calcerr.h
+	${Q} echo '#if !defined(__CALCERR_H__)' >> calcerr.h
+	${Q} echo '#define __CALCERR_H__' >> calcerr.h
+	${Q} echo '' >> calcerr.h
+	${Q} echo '' >> calcerr.h
+	${Q} ${SED} -f calcerr_h.sed < calcerr.tbl | \
 	    ${AWK} -f calcerr_h.awk >> calcerr.h
-	${Q}echo '' >> calcerr.h
-	${Q}echo '' >> calcerr.h
-	${Q}echo '#endif /* !__CALCERR_H__ */' >> calcerr.h
-	${Q}echo 'calcerr.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> calcerr.h
+	${Q} echo '' >> calcerr.h
+	${Q} echo '#endif /* !__CALCERR_H__ */' >> calcerr.h
+	${Q} echo 'calcerr.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2836,18 +2836,18 @@ calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE}
 	fi
 
 calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE}
-	-${Q}rm -f calerr.c
-	${Q}echo 'forming calcerr.c'
-	${Q}echo '/*' > calcerr.c
-	${Q}echo ' * DO NOT EDIT' >> calcerr.c
-	${Q}echo ' *' >> calcerr.c
-	${Q}echo ' * generated by calcerr.tbl via Makefile' >> calcerr.c
-	${Q}echo ' */' >> calcerr.c
-	${Q}echo '' >> calcerr.c
-	${Q}${SED} -f calcerr_c.sed < calcerr.tbl | \
+	-${Q} rm -f calerr.c
+	${Q} echo 'forming calcerr.c'
+	${Q} echo '/*' > calcerr.c
+	${Q} echo ' * DO NOT EDIT' >> calcerr.c
+	${Q} echo ' *' >> calcerr.c
+	${Q} echo ' * generated by calcerr.tbl via Makefile' >> calcerr.c
+	${Q} echo ' */' >> calcerr.c
+	${Q} echo '' >> calcerr.c
+	${Q} ${SED} -f calcerr_c.sed < calcerr.tbl | \
 	    ${AWK} -f calcerr_c.awk >> calcerr.c
-	${Q}echo 'calcerr.c formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo 'calcerr.c formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2858,9 +2858,9 @@ calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE}
 	fi
 
 no_implicit.arg: no_implicit.c ${MAKE_FILE}
-	-${Q}rm -f no_implicit${EXT} no_implicit.o no_implicit.arg
-	${Q}echo 'forming no_implicit.arg'
-	-${Q}if [ X"${HAVE_NO_IMPLICIT}" = X"YES" ]; then \
+	-${Q} rm -f no_implicit${EXT} no_implicit.o no_implicit.arg
+	${Q} echo 'forming no_implicit.arg'
+	-${Q} if [ X"${HAVE_NO_IMPLICIT}" = X"YES" ]; then \
 	     echo ""'-Wno-implicit' > no_implicit.arg; \
 	elif [ X"${HAVE_NO_IMPLICIT}" = X"NO" ]; then \
 	    touch no_implicit.arg; \
@@ -2871,8 +2871,8 @@ no_implicit.arg: no_implicit.c ${MAKE_FILE}
 	    ${SHELL} -c "./no_implicit${EXT} > no_implicit.arg 2>/dev/null" \
 	    	>/dev/null 2>&1; true; \
 	fi
-	${Q}echo 'no_implicit.arg formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo 'no_implicit.arg formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2883,36 +2883,36 @@ no_implicit.arg: no_implicit.c ${MAKE_FILE}
 	fi
 
 have_unused.h: have_unused.c ${MAKE_FILE}
-	-${Q}rm -f unused_tmp have_unused.h
-	${Q}echo 'forming have_unused.h'
-	${Q}echo '/*' > have_unused.h
-	${Q}echo ' * DO NOT EDIT -- generated by the Makefile' >> have_unused.h
-	${Q}echo ' */' >> have_unused.h
-	${Q}echo '' >> have_unused.h
-	${Q}echo '' >> have_unused.h
-	${Q}echo '#if !defined(__HAVE_UNUSED_H__)' >> have_unused.h
-	${Q}echo '#define __HAVE_UNUSED_H__' >> have_unused.h
-	${Q}echo '' >> have_unused.h
-	${Q}echo '' >> have_unused.h
-	${Q}echo '/* do we have/want the unused attribute? */' >> have_unused.h
-	-${Q}rm -f have_unused.o have_unused${EXT}
-	-${Q}${LCC} ${ICFLAGS} ${HAVE_UNUSED} have_unused.c -c \
+	-${Q} rm -f unused_tmp have_unused.h
+	${Q} echo 'forming have_unused.h'
+	${Q} echo '/*' > have_unused.h
+	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_unused.h
+	${Q} echo ' */' >> have_unused.h
+	${Q} echo '' >> have_unused.h
+	${Q} echo '' >> have_unused.h
+	${Q} echo '#if !defined(__HAVE_UNUSED_H__)' >> have_unused.h
+	${Q} echo '#define __HAVE_UNUSED_H__' >> have_unused.h
+	${Q} echo '' >> have_unused.h
+	${Q} echo '' >> have_unused.h
+	${Q} echo '/* do we have/want the unused attribute? */' >> have_unused.h
+	-${Q} rm -f have_unused.o have_unused${EXT}
+	-${Q} ${LCC} ${ICFLAGS} ${HAVE_UNUSED} have_unused.c -c \
 		>/dev/null 2>&1; true
-	-${Q}${LCC} ${ILDFLAGS} have_unused.o -o have_unused \
+	-${Q} ${LCC} ${ILDFLAGS} have_unused.o -o have_unused \
 		>/dev/null 2>&1; true
-	-${Q}${SHELL} -c "./have_unused${EXT} > unused_tmp 2>/dev/null" \
+	-${Q} ${SHELL} -c "./have_unused${EXT} > unused_tmp 2>/dev/null" \
 	    >/dev/null 2>&1; true
-	-${Q}if [ -s unused_tmp ]; then \
+	-${Q} if [ -s unused_tmp ]; then \
 	    cat unused_tmp >> have_unused.h; \
 	else \
 	    echo '#undef HAVE_UNUSED /* no */' >> have_unused.h; \
 	fi
-	${Q}echo '' >> have_unused.h
-	${Q}echo '' >> have_unused.h
-	${Q}echo '#endif /* !__HAVE_UNUSED_H__ */' >> have_unused.h
-	-${Q}rm -f have_unused${EXT} have_unused.o unused_tmp
-	${Q}echo 'have_unused.h formed'
-	-@if [ -z "${Q}" ]; then \
+	${Q} echo '' >> have_unused.h
+	${Q} echo '' >> have_unused.h
+	${Q} echo '#endif /* !__HAVE_UNUSED_H__ */' >> have_unused.h
+	-${Q} rm -f have_unused${EXT} have_unused.o unused_tmp
+	${Q} echo 'have_unused.h formed'
+	-@if [ -z "${Q} " ]; then \
 	    echo ''; \
 	    echo '=-=-= start of $@ =-=-='; \
 	    cat $@; \
@@ -2932,12 +2932,12 @@ have_unused.h: have_unused.c ${MAKE_FILE}
 ##
 
 win32_hsrc: ${MAKE_FILE} win32.mkdef
-	${Q}echo 'forming win32 directory'
-	${Q}rm -rf win32
-	${Q}${MKDIR} win32
-	${Q}cp ${UTIL_C_SRC} win32
-	${Q}cp ${UTIL_MISC_SRC} Makefile win32
-	${Q}(cd win32; \
+	${Q} echo 'forming win32 directory'
+	${Q} rm -rf win32
+	${Q} ${MKDIR} win32
+	${Q} cp ${UTIL_C_SRC} win32
+	${Q} cp ${UTIL_MISC_SRC} Makefile win32
+	${Q} (cd win32; \
 	 echo "cd win32"; \
 	 echo "$(MAKE) hsrc `cat win32.mkdef` EXT="; \
 	 $(MAKE) hsrc `cat win32.mkdef` EXT=; \
@@ -2946,7 +2946,7 @@ win32_hsrc: ${MAKE_FILE} win32.mkdef
 	 rm -f ${UTIL_OBJS}; \
 	 rm -f ${UTIL_PROGS}; \
 	 rm -f Makefile)
-	${Q}echo 'win32 directory formed'
+	${Q} echo 'win32 directory formed'
 
 
 ##
@@ -3030,8 +3030,8 @@ ${SAMPLE_TARGETS}: libcalc.a
 custom/libcustcalc:
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking all rule for custom =-=-=-=-='
-	-${Q}rm -f .libcustcalc_error
-	-${Q}NEED="`cd custom; ${MAKE} -n -f Makefile all`"; \
+	-${Q} rm -f .libcustcalc_error
+	-${Q} NEED="`cd custom; ${MAKE} -n -f Makefile all`"; \
 	 if [ ! -z "$$NEED" ]; then \
 	    echo "	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} all";\
 	    cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} all; \
@@ -3040,7 +3040,7 @@ custom/libcustcalc:
 		echo "$$status" > ../.libcustcalc_error; \
 	    fi; \
 	fi
-	${Q}if [ -f .libcustcalc_error ]; then \
+	${Q} if [ -f .libcustcalc_error ]; then \
 	    echo "custom make failed, code: `cat .libcustcalc_error`" 1>&2; \
 	    exit "`cat .libcustcalc_error`"; \
 	else \
@@ -3054,7 +3054,7 @@ custom/libcustcalc:
 custom/libcustcalc.a:
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking all rule for custom =-=-=-=-='
-	${Q}cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} all
+	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} all
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
@@ -3071,27 +3071,27 @@ custom/libcustcalc.a:
 ##
 
 depend: hsrc
-	${Q}if [ -f Makefile.bak ]; then \
+	${Q} if [ -f Makefile.bak ]; then \
 		echo "Makefile.bak exists, remove or move it out of the way"; \
 		exit 1; \
 	else \
 	    true; \
 	fi
 	${V} echo '=-=-=-=-= Invoking depend rule for custom =-=-=-=-='
-	-${Q}(cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} depend)
+	-${Q} (cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} depend)
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking depend rule for sample =-=-=-=-='
-	-${Q}(cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} depend)
+	-${Q} (cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} depend)
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
-	${Q}echo forming skel
-	-${Q}rm -rf skel
-	${Q}${MKDIR} skel
-	-${Q}for i in ${C_SRC} ${BUILD_C_SRC}; do \
+	${Q} echo forming skel
+	-${Q} rm -rf skel
+	${Q} ${MKDIR} skel
+	-${Q} for i in ${C_SRC} ${BUILD_C_SRC}; do \
 		${SED} -n '/^#[	 ]*include[	 ]*"/p' "$$i" | \
 		    ${GREP} -v '\.\./getopt/getopt\.h' > "skel/$$i"; \
 	done
-	${Q}${MKDIR} skel/custom
-	-${Q}for i in ${H_SRC} ${BUILD_H_SRC} custom.h /dev/null; do \
+	${Q} ${MKDIR} skel/custom
+	-${Q} for i in ${H_SRC} ${BUILD_H_SRC} custom.h /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		tag="`echo $$i | ${SED} 's/[\.+,:]/_/g'`"; \
 		echo "#if !defined($$tag)" > "skel/$$i"; \
@@ -3101,27 +3101,27 @@ depend: hsrc
 		echo '#endif /* '"$$tag"' */' >> "skel/$$i"; \
 	    fi; \
 	done
-	-${Q}rm -f skel/makedep.out
-	${Q}echo skel formed
-	${Q}echo forming dependency list
-	${Q}echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
+	-${Q} rm -f skel/makedep.out
+	${Q} echo skel formed
+	${Q} echo forming dependency list
+	${Q} echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > \
 	    skel/makedep.out
-	${Q}cd skel; \
+	${Q} cd skel; \
 	    ${MAKEDEPEND} -w 1 -f makedep.out ${C_SRC} ${BUILD_C_SRC}
-	-${Q}for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \
+	-${Q} for i in ${C_SRC} ${BUILD_C_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo "$$i" | ${SED} 's/^\(.*\)\.c/\1.o: \1.c/'; \
 	    fi; \
 	done >> skel/makedep.out
-	${Q}echo dependency list formed
-	${Q}echo forming new Makefile
-	-${Q}rm -f Makefile.bak
-	${Q}mv Makefile Makefile.bak
-	${Q}${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
-	${Q}echo "" >> Makefile
-	${Q}${SED} -n '3,$$p' skel/makedep.out | LANG=C ${SORT} -u >> Makefile
-	-${Q}rm -rf skel
-	-${Q}if ${CMP} -s Makefile.bak Makefile; then \
+	${Q} echo dependency list formed
+	${Q} echo forming new Makefile
+	-${Q} rm -f Makefile.bak
+	${Q} mv Makefile Makefile.bak
+	${Q} ${SED} -n '1,/^# DO NOT DELETE THIS LINE/p' Makefile.bak > Makefile
+	${Q} echo "" >> Makefile
+	${Q} ${SED} -n '3,$$p' skel/makedep.out | LANG=C ${SORT} -u >> Makefile
+	-${Q} rm -rf skel
+	-${Q} if ${CMP} -s Makefile.bak Makefile; then \
 		echo 'Makefile was already up to date'; \
 		mv -f Makefile.bak Makefile; \
 	else \
@@ -3131,7 +3131,7 @@ depend: hsrc
 # generate the list of h files for lower level depend use
 #
 h_list:
-	-${Q}for i in ${H_SRC} ${BUILD_H_SRC} /dev/null; do \
+	-${Q} for i in ${H_SRC} ${BUILD_H_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo $$i; \
 	    fi; \
@@ -3153,7 +3153,7 @@ ver_calc${EXT}: version.c have_unused.h
 ##
 
 distlist: ${DISTLIST}
-	${Q}(for i in ${DISTLIST} /dev/null; do \
+	${Q} (for i in ${DISTLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo $$i; \
 	    fi; \
@@ -3170,7 +3170,7 @@ distlist: ${DISTLIST}
 	(cd sample; ${MAKE} ${SAMPLE_PASSDOWN} $@)) | LANG=C ${SORT}
 
 distdir:
-	${Q}(echo .; \
+	${Q} (echo .; \
 	echo win32; \
 	(cd help; ${MAKE} ${HELP_PASSDOWN} $@); \
 	(cd cal; ${MAKE} ${CAL_PASSDOWN} $@); \
@@ -3179,7 +3179,7 @@ distdir:
 	(cd sample; ${MAKE} ${SAMPLE_PASSDOWN} $@)) | LANG=C ${SORT}
 
 calcliblist:
-	${Q}(for i in ${CALCLIBLIST} /dev/null; do \
+	${Q} (for i in ${CALCLIBLIST} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo $$i; \
 	    fi; \
@@ -3191,7 +3191,7 @@ calcliblist:
 	(cd sample; ${MAKE} ${SAMPLE_PASSDOWN} $@)) | LANG=C ${SORT}
 
 calcliblistfmt:
-	${Q}${MAKE} calcliblist | ${FMT} -64 | ${SED} -e 's/^/	/'
+	${Q} ${MAKE} calcliblist | ${FMT} -64 | ${SED} -e 's/^/	/'
 
 ##
 #
@@ -3301,7 +3301,7 @@ env:
 	@echo 'MAKEDEPEND=${MAKEDEPEND}'; echo ''
 	@echo 'MKDIR_ARG=${MKDIR_ARG}'; echo ''
 	@echo 'EXT=${EXT}'; echo ''
-	@echo 'Q=${Q}'; echo ''
+	@echo 'Q=${Q} '; echo ''
 	@echo 'V=${V}'; echo ''
 	@echo 'LIBSRC=${LIBSRC}'; echo ''
 	@echo 'LIBOBJS=${LIBOBJS}'; echo ''
@@ -3414,30 +3414,30 @@ rpm: clobber rpm.mk calc.spec.in
 inst_files: ${MAKE_FILE} help/Makefile cal/Makefile custom/Makefile \
 	   cscript/Makefile ver_calc${EXT}
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
-	${Q}rm -f inst_files
-	${Q}echo ${BINDIR}/calc${EXT} > inst_files
-	${Q}cd help; LANG=C \
+	${Q} rm -f inst_files
+	${Q} echo ${BINDIR}/calc${EXT} > inst_files
+	${Q} cd help; LANG=C \
 	    ${MAKE} -f Makefile ${HELP_PASSDOWN} echo_inst_files | \
 	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' >> ../inst_files
-	${Q}cd cal; LANG=C \
+	${Q} cd cal; LANG=C \
 	    ${MAKE} -f Makefile ${CAL_PASSDOWN} echo_inst_files | \
 	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' >> ../inst_files
-	${Q}cd custom; LANG=C \
+	${Q} cd custom; LANG=C \
 	    ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} echo_inst_files | \
 	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' >> ../inst_files
-	${Q}cd cscript; LANG=C \
+	${Q} cd cscript; LANG=C \
 	    ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} echo_inst_files | \
 	    ${GREP} '__file__..' | ${SED} -e s'/.*__file__ //' >> ../inst_files
-	${Q}echo ${LIBDIR}/libcalc.a >> inst_files
-	${Q}for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \
+	${Q} echo ${LIBDIR}/libcalc.a >> inst_files
+	${Q} for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \
 	    if [ X"$$i" != X"/dev/null" ]; then \
 		echo ${CALC_INCDIR}/$$i; \
 	    fi; \
 	done >> inst_files
-	${Q}if [ ! -z "${MANDIR}" ]; then \
+	${Q} if [ ! -z "${MANDIR}" ]; then \
 	    echo ${MANDIR}/calc.${MANEXT}; \
 	fi >> inst_files
-	${Q}LANG=C ${SORT} -u inst_files -o inst_files
+	${Q} LANG=C ${SORT} -u inst_files -o inst_files
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
 # The olduninstall rule will remove calc files from the older, histroic
@@ -3483,12 +3483,12 @@ clean:
 	-rm -f ${UTIL_PROGS}
 	-rm -f .libcustcalc_error
 	-rm -f calc.spec.sed
-	${Q}echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
+	${Q} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
 	-cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} clean
-	${Q}echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
-	${Q}echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
+	${Q} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+	${Q} echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
 	-cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} clean
-	${Q}echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+	${Q} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
 	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} clean
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
@@ -3498,7 +3498,7 @@ clean:
 	${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
 	cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} clean
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
-	${Q}echo remove files that are obsolete
+	${Q} echo remove files that are obsolete
 	-rm -rf lib
 	-rm -f endian.h stdarg.h libcalcerr.a cal/obj help/obj
 	-rm -f have_vs.c std_arg.h try_stdarg.c fnvhash.c
@@ -3549,7 +3549,7 @@ clobber:
 #
 install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
-	-${Q}if [ ! -z "$T" ]; then \
+	-${Q} if [ ! -z "$T" ]; then \
 	    if [ ! -d $T ]; then \
 		echo ${MKDIR} ${MKDIR_ARG} $T; \
 		${MKDIR} ${MKDIR_ARG} $T; \
@@ -3557,7 +3557,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 		${CHMOD} 0755 $T; \
 	    fi; \
 	fi
-	-${Q}if [ ! -d $T${BINDIR} ]; then \
+	-${Q} if [ ! -d $T${BINDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${BINDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${BINDIR}; \
 	    echo ${CHMOD} 0755 $T${BINDIR}; \
@@ -3565,7 +3565,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${INCDIR} ]; then \
+	-${Q} if [ ! -d $T${INCDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${INCDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${INCDIR}; \
 	    echo ${CHMOD} 0755 $T${INCDIR}; \
@@ -3573,7 +3573,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${LIBDIR} ]; then \
+	-${Q} if [ ! -d $T${LIBDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${LIBDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${LIBDIR}; \
 	    echo ${CHMOD} 0755 $T${LIBDIR}; \
@@ -3581,7 +3581,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
+	-${Q} if [ ! -d $T${CALC_SHAREDIR} ]; then \
 	    ${MKDIR} ${MKDIR_ARG} $T${CALC_SHAREDIR}; \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${CALC_SHAREDIR}; \
 	    echo ${CHMOD} 0755 $T${CALC_SHAREDIR}; \
@@ -3589,7 +3589,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${HELPDIR} ]; then \
+	-${Q} if [ ! -d $T${HELPDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${HELPDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${HELPDIR}; \
 	    echo ${CHMOD} 0755 $T${HELPDIR}; \
@@ -3597,7 +3597,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CALC_INCDIR} ]; then \
+	-${Q} if [ ! -d $T${CALC_INCDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${CALC_INCDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${CALC_INCDIR}; \
 	    echo ${CHMOD} 0755 $T${CALC_INCDIR}; \
@@ -3605,7 +3605,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMCALDIR} ]; then \
+	-${Q} if [ ! -d $T${CUSTOMCALDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${CUSTOMCALDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${CUSTOMCALDIR}; \
 	    echo ${CHMOD} 0755 $T${CUSTOMCALDIR}; \
@@ -3613,7 +3613,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMHELPDIR} ]; then \
+	-${Q} if [ ! -d $T${CUSTOMHELPDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${CUSTOMHELPDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${CUSTOMHELPDIR}; \
 	    echo ${CHMOD} 0755 $T${CUSTOMHELPDIR}; \
@@ -3621,7 +3621,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${CUSTOMINCDIR} ]; then \
+	-${Q} if [ ! -d $T${CUSTOMINCDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${CUSTOMINCDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${CUSTOMINCDIR}; \
 	    echo ${CHMOD} 0755 $T${CUSTOMINCDIR}; \
@@ -3629,7 +3629,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -d $T${SCRIPTDIR} ]; then \
+	-${Q} if [ ! -d $T${SCRIPTDIR} ]; then \
 	    echo ${MKDIR} ${MKDIR_ARG} $T${SCRIPTDIR}; \
 	    ${MKDIR} ${MKDIR_ARG} $T${SCRIPTDIR}; \
 	    echo ${CHMOD} 0755 $T${SCRIPTDIR}; \
@@ -3637,7 +3637,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -z "${MANDIR}" ]; then \
+	-${Q} if [ ! -z "${MANDIR}" ]; then \
 	    if [ ! -d $T${MANDIR} ]; then \
 		echo ${MKDIR} ${MKDIR_ARG} $T${MANDIR}; \
 		${MKDIR} ${MKDIR_ARG} $T${MANDIR}; \
@@ -3649,7 +3649,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if [ ! -z "${CATDIR}" ]; then \
+	-${Q} if [ ! -z "${CATDIR}" ]; then \
 	    if [ ! -d $T${CATDIR} ]; then \
 		echo ${MKDIR} ${MKDIR_ARG} $T${CATDIR}; \
 		${MKDIR} ${MKDIR_ARG} $T${CATDIR}; \
@@ -3661,7 +3661,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	else \
 	    true; \
 	fi
-	-${Q}if ${CMP} -s calc${EXT} $T${BINDIR}/calc${EXT}; then \
+	-${Q} if ${CMP} -s calc${EXT} $T${BINDIR}/calc${EXT}; then \
 	    true; \
 	else \
 	    rm -f $T${BINDIR}/calc.new${EXT}; \
@@ -3671,21 +3671,21 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	    echo "installed $T${BINDIR}/calc${EXT}"; \
 	fi
 	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
-	${Q}cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} install
+	${Q} cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
-	${Q}cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} install
+	${Q} cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
-	${Q}cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install
+	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for sample =-=-=-=-='
-	${Q}cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} install
+	${Q} cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
-	${Q}cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} install
+	${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
-	-${Q}if ${CMP} -s libcalc.a $T${LIBDIR}/libcalc.a; then \
+	-${Q} if ${CMP} -s libcalc.a $T${LIBDIR}/libcalc.a; then \
 		true; \
 	else \
 		rm -f $T${LIBDIR}/libcalc.a.new; \
@@ -3695,7 +3695,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 		${CHMOD} 0444 $T${LIBDIR}/libcalc.a; \
 		echo "installed $T${LIBDIR}/libcalc.a"; \
 	fi
-	-${Q}for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \
+	-${Q} for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
@@ -3711,8 +3711,8 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 		echo "installed $T${CALC_INCDIR}/$$i"; \
 	    fi; \
 	done
-	${Q}rm -f tmp
-	-${Q}if [ -z "${MANDIR}" ]; then \
+	${Q} rm -f tmp
+	-${Q} if [ -z "${MANDIR}" ]; then \
 	    true; \
 	else \
 	    if ${CMP} -s calc.1 $T${MANDIR}/calc.${MANEXT}; then \
@@ -3726,7 +3726,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 		echo "installed $T${MANDIR}/calc.${MANEXT}"; \
 	    fi; \
 	fi
-	-${Q}if [ -z "${CATDIR}" ]; then \
+	-${Q} if [ -z "${CATDIR}" ]; then \
 	    true; \
 	else \
 	    if ${CMP} -s calc.1 $T${MANDIR}/calc.${MANEXT}; then \
@@ -3754,7 +3754,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 #
 uninstall:
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
-	-${Q}if [ -z "${CATDIR}" ]; then \
+	-${Q} if [ -z "${CATDIR}" ]; then \
 	    true; \
 	else \
 	    if [ -f "$T${CATDIR}/calc.${CATEXT}" ]; then \
@@ -3766,7 +3766,7 @@ uninstall:
 		fi; \
 	    fi; \
 	fi
-	-${Q}if [ -z "${MANDIR}" ]; then \
+	-${Q} if [ -z "${MANDIR}" ]; then \
 	    true; \
 	else \
 	    if [ -f "$T${MANDIR}/calc.${MANEXT}" ]; then \
@@ -3778,7 +3778,7 @@ uninstall:
 		fi; \
 	    fi; \
 	fi
-	-${Q}for i in ${BUILD_H_SRC} ${LIB_H_SRC} /dev/null; do \
+	-${Q} for i in ${BUILD_H_SRC} ${LIB_H_SRC} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
@@ -3791,7 +3791,7 @@ uninstall:
 		fi; \
 	    fi; \
 	done
-	-${Q}if [ -f "$T${LIBDIR}/libcalc.a" ]; then \
+	-${Q} if [ -f "$T${LIBDIR}/libcalc.a" ]; then \
 	    rm -f "$T${LIBDIR}/libcalc.a"; \
 	    if [ -f "$T${LIBDIR}/libcalc.a" ]; then \
 		echo "cannot uninstall $T${LIBDIR}/libcalc.a"; \
@@ -3800,21 +3800,21 @@ uninstall:
 	    fi; \
 	fi
 	${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
-	${Q}cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} uninstall
+	${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} uninstall
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for sample =-=-=-=-='
-	${Q}cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} uninstall
+	${Q} cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} uninstall
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
-	${Q}cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} uninstall
+	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} uninstall
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
-	${Q}cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} uninstall
+	${Q} cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} uninstall
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
-	${Q}cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} uninstall
+	${Q} cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} uninstall
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
-	-${Q}if [ -f "$T${BINDIR}/calc${EXT}" ]; then \
+	-${Q} if [ -f "$T${BINDIR}/calc${EXT}" ]; then \
 	    rm -f "$T${BINDIR}/calc${EXT}"; \
 	    if [ -f "$T${BINDIR}/calc${EXT}" ]; then \
 		echo "cannot uninstall $T${BINDIR}/calc${EXT}"; \
@@ -3822,7 +3822,7 @@ uninstall:
 		echo "uninstalled $T${BINDIR}/calc${EXT}"; \
 	    fi; \
 	fi
-	-${Q}for i in ${CATDIR} ${MANDIR} ${SCRIPTDIR} \
+	-${Q} for i in ${CATDIR} ${MANDIR} ${SCRIPTDIR} \
 		    ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \
 		    ${CALC_INCDIR} ${LIBDIR} ${INCDIR} ${BINDIR}; do \
 	    if [ -d "$T$$i" ]; then \
@@ -3830,7 +3830,7 @@ uninstall:
 		echo "cleaned up $T$$i"; \
 	    fi; \
 	done
-	-${Q}if [ ! -z "$T" ]; then \
+	-${Q} if [ ! -z "$T" ]; then \
 	    if [ -d "$T" ]; then \
 		rmdir "$T" 2>/dev/null; \
 		echo "cleaned up $T"; \
diff --git a/version.c b/version.c
index 889f43c..afd6047 100644
--- a/version.c
+++ b/version.c
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.66 $
- * @(#) $Id: version.c,v 29.66 2006/09/17 20:55:31 chongo Exp $
+ * @(#) $Revision: 29.67 $
+ * @(#) $Id: version.c,v 29.67 2006/09/17 23:50:45 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -48,7 +48,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	12	/* minor version */
 #define MAJOR_PATCH	1	/* patch level or 0 if no patch */
-#define MINOR_PATCH	0	/* test number or 0 if no minor patch */
+#define MINOR_PATCH	1	/* test number or 0 if no minor patch */
 
 
 /*