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.93
retrieving revision 1.114
diff -u -p -r1.93 -r1.114
--- src/share/mk/bsd.prog.mk	1998/04/09 00:32:36	1.93
+++ src/share/mk/bsd.prog.mk	2000/06/06 09:22:02	1.114
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.93 1998/04/09 00:32:36 tv Exp $
+#	$NetBSD: bsd.prog.mk,v 1.114 2000/06/06 09:22:02 mycroft Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .if !target(__initialized__)
@@ -8,18 +8,18 @@ __initialized__:
 .endif
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
+.include <bsd.depall.mk>
 .MAIN:		all
 .endif
 
 .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 +28,8 @@ 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
@@ -39,11 +40,13 @@ LIBDES?=	${DESTDIR}/usr/lib/libdes.a
 LIBEDIT?=	${DESTDIR}/usr/lib/libedit.a
 LIBGCC?=	${DESTDIR}/usr/lib/libgcc.a
 LIBGNUMALLOC?=	${DESTDIR}/usr/lib/libgnumalloc.a
+LIBIPSEC?=	${DESTDIR}/usr/lib/libipsec.a
 LIBKDB?=	${DESTDIR}/usr/lib/libkdb.a
 LIBKRB?=	${DESTDIR}/usr/lib/libkrb.a
 LIBKVM?=	${DESTDIR}/usr/lib/libkvm.a
 LIBL?=		${DESTDIR}/usr/lib/libl.a
 LIBM?=		${DESTDIR}/usr/lib/libm.a
+LIBMENU?=	${DESTDIR}/usr/lib/libmenu.a
 LIBMP?=		${DESTDIR}/usr/lib/libmp.a
 LIBNTP?=	${DESTDIR}/usr/lib/libntp.a
 LIBOBJC?=	${DESTDIR}/usr/lib/libobjc.a
@@ -91,8 +94,8 @@ CLEANFILES+=	${DPSRCS}
 CLEANFILES+=	${SRCS:M*.y:.y=.h}
 .endif
 
-.if !empty(SRCS:N*.h:N*.sh)
-OBJS+=		${SRCS:N*.h:N*.sh:R:S/$/.o/g}
+.if !empty(SRCS:N*.h:N*.sh:N*.fth)
+OBJS+=		${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
 LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
 .endif
 
@@ -101,7 +104,7 @@ LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=
 .if defined(DESTDIR)
 
 ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
-	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND}
+	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND}
 
 .else
 
@@ -111,12 +114,12 @@ ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${
 .endif	# defined(DESTDIR)
 .endif	# defined(OBJS) && !empty(OBJS)
 
-.if	!defined(MAN)
+.if !defined(MAN)
 MAN=	${PROG}.1
 .endif	# !defined(MAN)
 .endif	# defined(PROG)
 
-all: ${PROG}
+realall: ${PROG} ${SCRIPTS}
 
 cleanprog:
 	rm -f a.out [Ee]rrs mklog core *.core \
@@ -131,19 +134,20 @@ afterdepend: .depend
 .endif
 
 .if defined(PROG) && !target(proginstall)
-PROGNAME?= ${PROG}
+PROGNAME?=${PROG}
+
 proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
+.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
 .if !defined(UPDATE)
 .PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
 .endif
-.if !defined(BUILD)
+
+.if !defined(BUILD) && !make(all) && !make(${PROG})
 ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .endif
-
-.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
 ${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG}
-	${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} \
-	    -m ${BINMODE} ${.ALLSRC} ${.TARGET}
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
+	    -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET}
 .endif
 
 .if !target(proginstall)
@@ -155,29 +159,23 @@ SCRIPTSDIR?=${BINDIR}
 SCRIPTSOWN?=${BINOWN}
 SCRIPTSGRP?=${BINGRP}
 SCRIPTSMODE?=${BINMODE}
-.for S in ${SCRIPTS}
-SCRIPTSDIR_${S}?=${SCRIPTSDIR}
-SCRIPTSOWN_${S}?=${SCRIPTSOWN}
-SCRIPTSGRP_${S}?=${SCRIPTSGRP}
-SCRIPTSMODE_${S}?=${SCRIPTSMODE}
-.if defined(SCRIPTSNAME)
-SCRIPTSNAME_${S} ?= ${SCRIPTSNAME}
-.else
-SCRIPTSNAME_${S} ?= ${S:T:R}
-.endif
-SCRIPTSDIR_${S} ?= ${SCRIPTSDIR}
-scriptsinstall:: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
+
+scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
+.PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 .if !defined(UPDATE)
-.PHONY: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
-.endif
-.if !defined(BUILD)
-${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: .MADE
+.PHONY: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
 .endif
 
-.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}
+.for S in ${SCRIPTS}
+.if !defined(BUILD) && !make(all) && !make(${S})
+${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE
+.endif
+${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S}
+	${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
+	    -o ${SCRIPTSOWN_${S}:U${SCRIPTSOWN}} \
+	    -g ${SCRIPTSGRP_${S}:U${SCRIPTSGRP}} \
+	    -m ${SCRIPTSMODE_${S}:U${SCRIPTSMODE}} \
+	    ${.ALLSRC} ${.TARGET}
 .endfor
 .endif