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
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.89
retrieving revision 1.97
diff -u -p -r1.89 -r1.97
--- src/share/mk/bsd.prog.mk	1997/10/28 12:46:30	1.89
+++ src/share/mk/bsd.prog.mk	1998/11/07 07:10:19	1.97
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.89 1997/10/28 12:46:30 lukem Exp $
+#	$NetBSD: bsd.prog.mk,v 1.97 1998/11/07 07:10:19 jonathan Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .if !target(__initialized__)
@@ -13,13 +13,12 @@ __initialized__:
 
 .PHONY:		cleanprog proginstall scriptsinstall
 realinstall:	proginstall scriptsinstall
-clean cleandir:	cleanprog
+clean cleandir distclean: cleanprog
 
 CFLAGS+=	${COPTS}
 
 # ELF platforms depend on crtbegin.o and crtend.o
-.if (${MACHINE_ARCH} == "alpha")   || \
-    (${MACHINE_ARCH} == "powerpc")
+.if (${OBJECT_FMT} == "ELF")
 LIBCRTBEGIN?=	${DESTDIR}/usr/lib/crtbegin.o
 LIBCRTEND?=	${DESTDIR}/usr/lib/crtend.o
 .else
@@ -28,7 +27,9 @@ LIBCRTEND?=
 .endif
 
 LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
+
 LIBBFD?=	${DESTDIR}/usr/lib/libbfd.a
+LIBBZ2?=	${DESTDIR}/usr/lib/libbz2.a
 LIBC?=		${DESTDIR}/usr/lib/libc.a
 LIBC_PIC?=	${DESTDIR}/usr/lib/libc_pic.a
 LIBCOMPAT?=	${DESTDIR}/usr/lib/libcompat.a
@@ -87,6 +88,9 @@ SRCS?=		${PROG}.c
 
 DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
 CLEANFILES+=	${DPSRCS}
+.if defined(YHEADER)
+CLEANFILES+=	${SRCS:M*.y:.y=.h}
+.endif
 
 .if !empty(SRCS:N*.h:N*.sh)
 OBJS+=		${SRCS:N*.h:N*.sh:R:S/$/.o/g}
@@ -139,7 +143,7 @@ ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 
 .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
 ${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG}
-	${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} \
+	${INSTALL} ${PRESERVE} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} \
 	    -m ${BINMODE} ${.ALLSRC} ${.TARGET}
 .endif
 
@@ -173,8 +177,8 @@ ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNA
 
 .PRECIOUS: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
 ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: ${S}
-	${INSTALL} ${COPY} -o ${SCRIPTSOWN_${S}} -g ${SCRIPTSGRP_${S}} \
-		-m ${SCRIPTSMODE_${S}} ${.ALLSRC} ${.TARGET}
+	${INSTALL} ${PRESERVE} ${COPY} -o ${SCRIPTSOWN_${S}} -g \
+	    ${SCRIPTSGRP_${S}} -m ${SCRIPTSMODE_${S}} ${.ALLSRC} ${.TARGET}
 .endfor
 .endif
 
@@ -184,7 +188,7 @@ scriptsinstall::
 
 lint: ${LOBJS}
 .if defined(LOBJS) && !empty(LOBJS)
-	@${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
+	${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}
 .endif
 
 .include <bsd.man.mk>