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.59
retrieving revision 1.72
diff -u -p -r1.59 -r1.72
--- src/share/mk/bsd.prog.mk	1996/12/20 16:39:03	1.59
+++ src/share/mk/bsd.prog.mk	1997/05/06 21:29:44	1.72
@@ -1,18 +1,32 @@
-#	$NetBSD: bsd.prog.mk,v 1.59 1996/12/20 16:39:03 cgd Exp $
-#	@(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
+#	$NetBSD: bsd.prog.mk,v 1.72 1997/05/06 21:29:44 mycroft Exp $
+#	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
+.MAIN:		all
+.PHONY:		cleanprog afterdepend beforeinstall proginstall afterinstall
+
 .include <bsd.own.mk>
 
 .SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
 
 CFLAGS+=	${COPTS}
 
+# ELF platforms depend on crtbegin.o and crtend.o
+.if (${MACHINE_ARCH} == "alpha")   || \
+    (${MACHINE_ARCH} == "powerpc")
+LIBCRTBEGIN?=	${DESTDIR}/usr/lib/crtbegin.o
+LIBCRTEND?=	${DESTDIR}/usr/lib/crtend.o
+.else
+LIBCRTBEGIN?=
+LIBCRTEND?=
+.endif
+
 LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
 LIBC?=		${DESTDIR}/usr/lib/libc.a
+LIBC_PIC?=	${DESTDIR}/usr/lib/libc_pic.a
 LIBCOMPAT?=	${DESTDIR}/usr/lib/libcompat.a
 LIBCRYPT?=	${DESTDIR}/usr/lib/libcrypt.a
 LIBCURSES?=	${DESTDIR}/usr/lib/libcurses.a
@@ -20,12 +34,14 @@ LIBDBM?=	${DESTDIR}/usr/lib/libdbm.a
 LIBDES?=	${DESTDIR}/usr/lib/libdes.a
 LIBEDIT?=	${DESTDIR}/usr/lib/libedit.a
 LIBGCC?=	${DESTDIR}/usr/lib/libgcc.a
+LIBGNUMALLOC?=	${DESTDIR}/usr/lib/libgnumalloc.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
 LIBMP?=		${DESTDIR}/usr/lib/libmp.a
+LIBNTP?=	${DESTDIR}/usr/lib/libntp.a
 LIBPC?=		${DESTDIR}/usr/lib/libpc.a
 LIBPCAP?=	${DESTDIR}/usr/lib/libpcap.a
 LIBPLOT?=	${DESTDIR}/usr/lib/libplot.a
@@ -33,6 +49,7 @@ LIBRESOLV?=	${DESTDIR}/usr/lib/libresolv
 LIBRPCSVC?=	${DESTDIR}/usr/lib/librpcsvc.a
 LIBSKEY?=	${DESTDIR}/usr/lib/libskey.a
 LIBTERMCAP?=	${DESTDIR}/usr/lib/libtermcap.a
+LIBTELNET?=	${DESTDIR}/usr/lib/libtelnet.a
 LIBUTIL?=	${DESTDIR}/usr/lib/libutil.a
 LIBWRAP?=	${DESTDIR}/usr/lib/libwrap.a
 LIBY?=		${DESTDIR}/usr/lib/liby.a
@@ -69,12 +86,12 @@ LOBJS+=	${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.
 .if defined(OBJS) && !empty(OBJS)
 .if defined(DESTDIR)
 
-${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${OBJS} ${LDADD} -lgcc -lc -lgcc
+${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND}
 
 .else
 
-${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD}
+${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
 
 .endif	# defined(DESTDIR)
@@ -85,16 +102,18 @@ MAN=	${PROG}.1
 .endif	# !defined(MAN)
 .endif	# defined(PROG)
 
-.MAIN: all
 all: ${PROG} _SUBDIRUSE
 
 .if !target(clean)
-clean: _SUBDIRUSE
+cleanprog:
 	rm -f a.out [Ee]rrs mklog core *.core \
 	    ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES}
-.endif
 
+clean: _SUBDIRUSE cleanprog
+cleandir: _SUBDIRUSE cleanprog
+.else
 cleandir: _SUBDIRUSE clean
+.endif
 
 .if defined(SRCS)
 afterdepend: .depend
@@ -113,31 +132,64 @@ afterinstall:
 .endif
 
 .if !target(realinstall)
-realinstall:
+
 .if defined(PROG)
-	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${PROG} ${DESTDIR}${BINDIR}
+PROGNAME?= ${PROG}
+proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
+.if !defined(UPDATE)
+.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME}
+.endif
+.if !defined(BUILD)
+${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
+.endif
+
+.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
+${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG}
+	${INSTALL} ${COPY} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} \
+	    -m ${BINMODE} ${.ALLSRC} ${.TARGET}
+.endif
+
+.if defined(SCRIPTS)
+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
-.if defined(HIDEGAME)
-	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG})
+SCRIPTSDIR_${S} ?= ${SCRIPTSDIR}
+proginstall:: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
+.if !defined(UPDATE)
+.PHONY: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}
 .endif
+.if !defined(BUILD)
+${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: .MADE
 .endif
 
-install: maninstall _SUBDIRUSE
-.if defined(LINKS) && !empty(LINKS)
-	@set ${LINKS}; \
-	while test $$# -ge 2; do \
-		l=${DESTDIR}$$1; \
-		shift; \
-		t=${DESTDIR}$$1; \
-		shift; \
-		echo $$t -\> $$l; \
-		rm -f $$t; \
-		ln $$l $$t; \
-	done; true
+.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}
+.endfor
 .endif
 
-maninstall: afterinstall
+.if target(proginstall)
+realinstall: proginstall filesinstall
+.else
+realinstall: filesinstall
+.endif
+.endif
+
+install: ${MANINSTALL} _SUBDIRUSE linksinstall
+
+${MANINSTALL}: afterinstall
 afterinstall: realinstall
 realinstall: beforeinstall
 .endif
@@ -158,6 +210,9 @@ lint: ${LOBJS}
 .endif
 
 .include <bsd.obj.mk>
+.include <bsd.links.mk>
+.include <bsd.files.mk>
+.include <bsd.inc.mk>
 .include <bsd.dep.mk>
 .include <bsd.subdir.mk>
 .include <bsd.sys.mk>