[src/trunk]: src/share/mk Support MAKEVERBOSE more effectively.

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9178cf91e24
branches:  trunk
changeset: 555001:b9178cf91e24
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Nov 07 00:05:24 2003 +0000

description:
Support MAKEVERBOSE more effectively.

diffstat:

 share/mk/bsd.inc.mk   |   7 ++++---
 share/mk/bsd.kinc.mk  |  11 +++++++----
 share/mk/bsd.links.mk |   8 +++++---
 share/mk/bsd.man.mk   |   8 ++++----
 share/mk/bsd.own.mk   |   5 ++++-
 5 files changed, 24 insertions(+), 15 deletions(-)

diffs (152 lines):

diff -r cf8232aa74a5 -r b9178cf91e24 share/mk/bsd.inc.mk
--- a/share/mk/bsd.inc.mk       Thu Nov 06 23:04:03 2003 +0000
+++ b/share/mk/bsd.inc.mk       Fri Nov 07 00:05:24 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.inc.mk,v 1.27 2003/10/19 03:00:55 lukem Exp $
+#      $NetBSD: bsd.inc.mk,v 1.28 2003/11/07 00:05:24 lukem Exp $
 
 .include <bsd.init.mk>
 
@@ -15,7 +15,7 @@
 # -c is forced on here, in order to preserve modtimes for "make depend"
 __incinstall: .USE
        @cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
-           (${_MKSHMSG} "install  ${.TARGET}"; \
+           (${_MKSHMSG_INSTALL} ${.TARGET}; \
             ${_MKSHECHO} "${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
                -m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}" && \
             ${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
@@ -50,7 +50,8 @@
                    [ "$$l" = "$$ttarg" ]; then \
                        continue ; \
                fi ; \
-               echo "$$t -> $$l"; \
+               ${_MKSHMSG_INSTALL} $$t; \
+               ${_MKSHECHO} ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
                ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
         done; )
 .endif
diff -r cf8232aa74a5 -r b9178cf91e24 share/mk/bsd.kinc.mk
--- a/share/mk/bsd.kinc.mk      Thu Nov 06 23:04:03 2003 +0000
+++ b/share/mk/bsd.kinc.mk      Fri Nov 07 00:05:24 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.kinc.mk,v 1.32 2003/10/20 01:53:02 chs Exp $
+#      $NetBSD: bsd.kinc.mk,v 1.33 2003/11/07 00:05:24 lukem Exp $
 
 # Variables:
 #
@@ -32,8 +32,10 @@
 
 ${DESTDIR}${INCSDIR}:
        @if [ ! -d ${.TARGET} ] || [ -h ${.TARGET} ] ; then \
-               echo creating ${.TARGET}; \
+               ${_MKSHMSG_CREATE} ${.TARGET}; \
                /bin/rm -rf ${.TARGET}; \
+               ${_MKSHECHO} ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
+                       ${SYSPKGTAG} ${.TARGET}; \
                ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
                        ${SYSPKGTAG} ${.TARGET}; \
        fi
@@ -41,7 +43,7 @@
 # -c is forced on here, in order to preserve modtimes for "make depend"
 __incinstall: .USE
        @cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
-           (${_MKSHMSG} "install  ${.TARGET}"; \
+           (${_MKSHMSG_INSTALL} ${.TARGET}; \
             ${_MKSHECHO} "${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
                -m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}" && \
             ${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
@@ -72,7 +74,8 @@
                    [ "$$l" = "$$ttarg" ]; then \
                        continue ; \
                fi ; \
-               echo "$$t -> $$l"; \
+               ${_MKSHMSG_INSTALL} $$t; \
+               ${_MKSHECHO} ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
                ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
         done; )
 .endif
diff -r cf8232aa74a5 -r b9178cf91e24 share/mk/bsd.links.mk
--- a/share/mk/bsd.links.mk     Thu Nov 06 23:04:03 2003 +0000
+++ b/share/mk/bsd.links.mk     Fri Nov 07 00:05:24 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.links.mk,v 1.24 2003/07/28 01:00:52 lukem Exp $
+#      $NetBSD: bsd.links.mk,v 1.25 2003/11/07 00:05:24 lukem Exp $
 
 .include <bsd.init.mk>
 
@@ -21,7 +21,8 @@
                    [ "$$l" = "$$ttarg" ]; then \
                        continue ; \
                fi ; \
-               echo "$$t -> $$l"; \
+               ${_MKSHMSG_INSTALL} $$t; \
+               ${_MKSHECHO} ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
                ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
         done; )
 .endif
@@ -35,7 +36,8 @@
                    [ "$$ldevino" = "$$tdevino" ]; then \
                        continue ; \
                fi ; \
-               echo "$$t -> $$l"; \
+               ${_MKSHMSG_INSTALL} $$t; \
+               ${_MKSHECHO} ${INSTALL_LINK} ${SYSPKGTAG} $$l $$t; \
                ${INSTALL_LINK} ${SYSPKGTAG} $$l $$t; \
        done ; )
 .endif
diff -r cf8232aa74a5 -r b9178cf91e24 share/mk/bsd.man.mk
--- a/share/mk/bsd.man.mk       Thu Nov 06 23:04:03 2003 +0000
+++ b/share/mk/bsd.man.mk       Fri Nov 07 00:05:24 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.man.mk,v 1.89 2003/11/06 22:59:03 lukem Exp $
+#      $NetBSD: bsd.man.mk,v 1.90 2003/11/07 00:05:24 lukem Exp $
 #      @(#)bsd.man.mk  8.1 (Berkeley) 6/8/93
 
 .include <bsd.init.mk>
@@ -45,7 +45,7 @@
 
 __installpage: .USE
        @cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
-           (${_MKSHMSG} "install  ${.TARGET}"; \
+           (${_MKSHMSG_INSTALL} ${.TARGET}; \
             ${_MKSHECHO} "${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
                ${SYSPKGDOCTAG} ${.ALLSRC} ${.TARGET}" && \
             ${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
@@ -97,7 +97,7 @@
                dir=${DESTDIR}${MANDIR}/man$${name##*.}; \
                t=$${dir}${MANSUBDIR}/$${name}${MANSUFFIX}; \
                if test $$l -nt $$t -o ! -f $$t; then \
-                       ${_MKSHMSG} "install  $$t"; \
+                       ${_MKSHMSG_INSTALL} $$t; \
                        ${_MKSHECHO} ${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
                        ${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
                fi; \
@@ -158,7 +158,7 @@
                dir=${DESTDIR}${MANDIR}/cat$${name##*.}; \
                t=$${dir}${MANSUBDIR}/$${name%.*}.0${MANSUFFIX}; \
                if test $$l -nt $$t -o ! -f $$t; then \
-                       ${_MKSHMSG} "install  $$t"; \
+                       ${_MKSHMSG_INSTALL} $$t; \
                        ${_MKSHECHO} ${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
                        ${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
                fi; \
diff -r cf8232aa74a5 -r b9178cf91e24 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Nov 06 23:04:03 2003 +0000
+++ b/share/mk/bsd.own.mk       Fri Nov 07 00:05:24 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.390 2003/11/05 07:14:31 skrll Exp $
+#      $NetBSD: bsd.own.mk,v 1.391 2003/11/07 00:05:24 lukem Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -756,6 +756,9 @@
 _MKMSG_REMOVE?=                ${_MKMSG} " remove "
 _MKMSG_YACC?=          ${_MKMSG} "   yacc "
 
+_MKSHMSG_CREATE?=      ${_MKSHMSG} " create "
+_MKSHMSG_INSTALL?=     ${_MKSHMSG} "install "
+
 _MKTARGET_BUILD?=      ${_MKMSG_BUILD} ${.TARGET}
 _MKTARGET_CREATE?=     ${_MKMSG_CREATE} ${.TARGET}
 _MKTARGET_COMPILE?=    ${_MKMSG_COMPILE} ${.TARGET}