Minor stylistic improvements in the SPECIAL_INSTALLCHECKS section, mainly

to reduce the number of wrapped lines.

Suggested by:	bde

1 files changed, 26 insertions, 25 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 4df337fe71ac..1147462f46c1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -355,49 +355,50 @@ SPECIAL_INSTALLCHECKS=
 .if ${TARGET_ARCH} == "sparc64"
 SPECIAL_INSTALLCHECKS+=sparc64_installcheck
 
-CUR_TIMETYPE!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}'
-SRC_TIMETYPE!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | awk '{print $$2}'
-NEWSPARC_TIMETYPE?=${CUR_TIMETYPE}
-THISHOST!= hostname -s
-.if ${THISHOST} == ""
+CUR_TIMET!=	grep __time_t /usr/include/machine/_types.h | awk '{print $$2}'
+SRC_TIMET!=	grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | \
+		awk '{print $$2}'
+NEWSPARC_TIMETYPE?=${CUR_TIMET}
+THISHOST!=	hostname -s
+.if empty(THISHOST)
 THISHOST="name not set yet"
 .endif
 
 sparc64_installcheck:
-.if ${CUR_TIMETYPE} != ${SRC_TIMETYPE}
-	@echo ""
-.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
-	@echo "***  ERROR: This target would change the type used for time_t!  ***"
+.if ${CUR_TIMET} != ${SRC_TIMET}
+	@echo
+.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
+	@echo "***  ERROR: This target would change the type used for time_t!"
 .else
-	@echo "* Note: This installation changes the type used for time_t"
+	@echo "* Note: This installation changes the type used for time_t."
 .endif
 	@echo "* "
-	@echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMETYPE},"
-	@echo "* and this installation will switch time_t to be type ${SRC_TIMETYPE}."
-.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
+	@echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMET},"
+	@echo "* and this installation will switch time_t to be type ${SRC_TIMET}."
+.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
 	@echo "* "
 	@echo "* If that is *NOT* what you wanted, then you need to change the"
-	@echo "* typedef for __time_t in:   ${.CURDIR}/sys/sparc64/include/_types.h"
-	@echo "* from '${SRC_TIMETYPE}' to '${CUR_TIMETYPE}'.  After that you *MUST* do a"
-	@echo "* complete cleanworld, buildworld, buildkernel before you retry"
-	@echo "* your 'make' command.  Also read /usr/src/UPDATING.64BTT."
+	@echo "* typedef of __time_t in ${.CURDIR}/sys/sparc64/include/_types.h"
+	@echo "* from '${SRC_TIMET}' to '${CUR_TIMET}'.  After that you *MUST*"
+	@echo "* do a complete cleanworld, buildworld, buildkernel before you"
+	@echo "* retry the 'make' command.  Also read /usr/src/UPDATING.64BTT."
 	@echo "* "
 	@echo "* If that *is* what you want, then enter the commands:"
-	@echo "      NEWSPARC_TIMETYPE=${SRC_TIMETYPE}"
+	@echo "      NEWSPARC_TIMETYPE=${SRC_TIMET}"
 	@echo "      export NEWSPARC_TIMETYPE"
 	@echo "* and repeat your 'make' command."
-	@echo ""
+	@echo
 	false
 .endif
-	@echo ""
-.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
-	@echo ""
-	@echo "***  ERROR: The variable NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'"
+	@echo
+.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
+	@echo
+	@echo "***  ERROR: NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'"
 	@echo "***         but ${.CURDIR}/sys/sparc64/include/_types.h"
-	@echo "***         has __time_t defined as:  '${SRC_TIMETYPE}'"
+	@echo "***         has __time_t defined as '${SRC_TIMET}'."
 	false
 .else
-	@# in sparc64_installcheck, all TIMETYPEs == '${NEWSPARC_TIMETYPE}'
+	@# in sparc64_installcheck, all TIMETYPEs == '${CUR_TIMET}'
 .endif
 .endif