From f1e290c2602fbfda591b9deb7ff6cad0ad4eae28 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Sat, 18 Oct 2003 16:41:19 +0000
Subject: [PATCH] implement MAKEVERBOSE for rules which are of the form:       
  @cmp -s ${.ALLSRC} ${.TARGET} || ( echo cmd && cmd )

---
 share/mk/bsd.inc.mk  |  5 +++--
 share/mk/bsd.kinc.mk |  5 +++--
 share/mk/bsd.man.mk  |  6 +++---
 share/mk/bsd.sys.mk  | 18 ++++++++++++------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/share/mk/bsd.inc.mk b/share/mk/bsd.inc.mk
index bfde2831f434..1ab3def0c308 100644
--- a/share/mk/bsd.inc.mk
+++ b/share/mk/bsd.inc.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.inc.mk,v 1.25 2003/08/03 09:23:16 lukem Exp $
+#	$NetBSD: bsd.inc.mk,v 1.26 2003/10/18 16:41:19 lukem Exp $
 
 .include <bsd.init.mk>
 
@@ -15,7 +15,8 @@ incinstall::	# ensure existence
 # -c is forced on here, in order to preserve modtimes for "make depend"
 __incinstall: .USE
 	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
-	    (echo "${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
+	    (${_MKSHMSG} "install  ${.TARGET}"; ${_MKSHCMD}\
+	     echo "${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
 		-m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}" && \
 	     ${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
 		-m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET})
diff --git a/share/mk/bsd.kinc.mk b/share/mk/bsd.kinc.mk
index 952a5451ce7a..508915dcdaf4 100644
--- a/share/mk/bsd.kinc.mk
+++ b/share/mk/bsd.kinc.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kinc.mk,v 1.29 2003/08/03 09:23:16 lukem Exp $
+#	$NetBSD: bsd.kinc.mk,v 1.30 2003/10/18 16:41:19 lukem Exp $
 
 # Variables:
 #
@@ -42,7 +42,8 @@ ${DESTDIR}${INCSDIR}:
 # -c is forced on here, in order to preserve modtimes for "make depend"
 __incinstall: .USE
 	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
-	    (echo "${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
+	    (${_MKSHMSG} "install  ${.TARGET}"; ${_MKSHCMD}\
+	     echo "${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
 		-m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}" && \
 	     ${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
 		-m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET})
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 446a8f4dbb5c..741911c26278 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.man.mk,v 1.85 2003/10/18 15:33:59 lukem Exp $
+#	$NetBSD: bsd.man.mk,v 1.86 2003/10/18 16:41:19 lukem Exp $
 #	@(#)bsd.man.mk	8.1 (Berkeley) 6/8/93
 
 .include <bsd.init.mk>
@@ -44,9 +44,9 @@ MANCOMPRESS:=	| ${MANCOMPRESS}
 .endif
 
 __installpage: .USE
-# XXX_MKMSG
 	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
-	    (echo "${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
+	    (${_MKSHMSG} "install  ${.TARGET}"; ${_MKSHCMD}\
+	     echo "${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
 		${SYSPKGDOCTAG} ${.ALLSRC} ${.TARGET}" && \
 	     ${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
 		${SYSPKGDOCTAG} ${.ALLSRC} ${.TARGET})
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 557b230fbca0..745e626549e1 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.96 2003/10/18 15:33:59 lukem Exp $
+#	$NetBSD: bsd.sys.mk,v 1.97 2003/10/18 16:41:19 lukem Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -8,14 +8,20 @@ _BSD_SYS_MK_=1
 MAKEVERBOSE?=	2
 
 .if ${MAKEVERBOSE} == 0
-_MKMSG=	@\#
-_MKCMD=	@
+_MKMSG=		@\#
+_MKCMD=		@
+_MKSHMSG=	: echo
+_MKSHCMD=	:
 .elif ${MAKEVERBOSE} == 1
-_MKMSG=	@echo '   '
-_MKCMD=	@
+_MKMSG=		@echo '   '
+_MKCMD=		@
+_MKSHMSG=	echo '   '
+_MKSHCMD=	:
 .else	# MAKEVERBOSE == 2 ?
-_MKMSG=	@echo '\#  '
+_MKMSG=		@echo '\#  '
 _MKCMD=	
+_MKSHMSG=	echo '\#  '
+_MKSHCMD=
 .endif
 
 .if defined(WARNS)