From 47fe34534d39c17510dd5a46864a7a2d60fdbae1 Mon Sep 17 00:00:00 2001 From: lukem Date: Tue, 21 Oct 2003 10:01:19 +0000 Subject: Rework how MAKEVERBOSE operates: * Don't bother prefixing commands with a line of ${_MKCMD}\ and instead rely upon "make -s". This is less intrusive on all the Makefiles than the former. Idea from David Laight. * Rename the variables use to print messages. The scheme now is: _MKMSG_FOO Run _MKMSG 'foo' _MKTARGET_FOO Run _MKMSG_FOO ${.TARGET} From discussion with Alistair Crooks. --- hack/Makefile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'hack') diff --git a/hack/Makefile b/hack/Makefile index 69996380..ac9b8d97 100644 --- a/hack/Makefile +++ b/hack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2003/10/19 04:45:01 lukem Exp $ +# $NetBSD: Makefile,v 1.38 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 .include @@ -28,13 +28,11 @@ FILESDIR=/var/games/hackdir CLEANFILES+=hack.onames.h hack.onames.h: makedefs def.objects.h - ${_MKMSGCREATE} - ${_MKCMD}\ + ${_MKTARGET_CREATE} ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h makedefs: makedefs.c - ${_MKMSGLINK} - ${_MKCMD}\ + ${_MKTARGET_LINK} ${HOST_LINK.c} -o makedefs ${.CURDIR}/makedefs.c hack.h: hack.onames.h @@ -44,16 +42,13 @@ afterinstall: clobber .endif clobber: - ${_MKMSGINSTALL.m} ${DESTDIR}/var/games/hackdir/perm - ${_MKCMD}\ + ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/perm ${INSTALL_FILE} -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/perm - ${_MKMSGINSTALL.m} ${DESTDIR}/var/games/hackdir/record - ${_MKCMD}\ + ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/record ${INSTALL_FILE} -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/record - ${_MKMSG} " remove ${DESTDIR}/var/games/hackdir/bones*" - ${_MKCMD}\ + ${_MKMSG_REMOVE} "${DESTDIR}/var/games/hackdir/bones*" rm -f ${DESTDIR}/var/games/hackdir/bones* .include -- cgit v1.2.3-56-ge451