Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- src/share/mk/bsd.prog.mk	2003/10/19 03:00:55	1.191
+++ src/share/mk/bsd.prog.mk	2003/10/21 10:01:22	1.192
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.191 2003/10/19 03:00:55 lukem Exp $
+#	$NetBSD: bsd.prog.mk,v 1.192 2003/10/21 10:01:22 lukem Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -161,17 +161,13 @@ _CCLINK=	${CC}
 .endif
 
 .gdbinit:
-	${_MKCMD}\
 	rm -f .gdbinit
 .if defined(DESTDIR) && !empty(DESTDIR)
-	${_MKCMD}\
 	echo "set solib-absolute-prefix ${DESTDIR}" > .gdbinit
 .else
-	${_MKCMD}\
 	touch .gdbinit
 .endif
 .for __gdbinit in ${GDBINIT}
-	${_MKCMD}\
 	echo "source ${__gdbinit}" >> .gdbinit
 .endfor
 
@@ -179,18 +175,15 @@ ${OBJS} ${LOBJS}: ${DPSRCS}
 
 ${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${PROG})
-	${_MKMSGLINK.m} ${PROG}
+	${_MKMSG_LINK} ${PROG}
 .if defined(DESTDIR)
-	${_MKCMD}\
 	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND}
 .else
-	${_MKCMD}\
 	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
 .endif	# defined(DESTDIR)
 .endif	# !commands(${PROG})
 
 ${PROG}.ro: ${OBJS} ${DPADD}
-	${_MKCMD}\
 	${LD} -r -dc -o ${.TARGET} ${OBJS}
 
 .endif	# defined(OBJS) && !empty(OBJS)
@@ -203,18 +196,15 @@ MAN=	${PROG}.1
 realall: ${PROG} ${SCRIPTS}
 
 cleanprog: cleanobjs cleanextra
-	${_MKCMD}\
 	rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}
 
 cleanobjs:
 .if defined(OBJS) && !empty(OBJS)
-	${_MKCMD}\
 	rm -f ${OBJS} ${LOBJS}
 .endif
 
 cleanextra:
 .if defined(CLEANFILES) && !empty(CLEANFILES)
-	${_MKCMD}\
 	rm -f ${CLEANFILES}
 .endif
 
@@ -233,8 +223,7 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROG
 .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
 
 __proginstall: .USE
-	${_MKMSGINSTALL}
-	${_MKCMD}\
+	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
@@ -265,8 +254,7 @@ scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}
 .PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 
 __scriptinstall: .USE
-	${_MKMSGINSTALL}
-	${_MKCMD}\
+	${_MKTARGET_INSTALL}
 	${INSTALL_FILE} \
 	    -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
 	    -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
@@ -294,7 +282,6 @@ scriptsinstall::
 
 lint: ${LOBJS}
 .if defined(LOBJS) && !empty(LOBJS)
-	${_MKCMD}\
 	${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
 .endif