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.30
retrieving revision 1.46
diff -u -p -r1.30 -r1.46
--- src/share/mk/bsd.prog.mk	1993/10/07 01:35:30	1.30
+++ src/share/mk/bsd.prog.mk	1994/07/06 04:13:37	1.46
@@ -1,5 +1,5 @@
-#	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.prog.mk,v 1.30 1993/10/07 01:35:30 cgd Exp $
+#	$NetBSD: bsd.prog.mk,v 1.46 1994/07/06 04:13:37 mycroft Exp $
+#	@(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -9,25 +9,27 @@
 
 CFLAGS+=	${COPTS}
 
-LIBCRT0?=	/usr/lib/crt0.o
-LIBC?=		/usr/lib/libc.a
-LIBCOMPAT?=	/usr/lib/libcompat.a
-LIBCRYPT?=	/usr/lib/libcrypt.a
-LIBCURSES?=	/usr/lib/libcurses.a
-LIBDBM?=	/usr/lib/libdbm.a
-LIBDES?=	/usr/lib/libdes.a
-LIBL?=		/usr/lib/libl.a
-LIBKDB?=	/usr/lib/libkdb.a
-LIBKRB?=	/usr/lib/libkrb.a
-LIBM?=		/usr/lib/libm.a
-LIBMP?=		/usr/lib/libmp.a
-LIBPC?=		/usr/lib/libpc.a
-LIBPLOT?=	/usr/lib/libplot.a
-LIBRESOLV?=	/usr/lib/libresolv.a
-LIBRPC?=	/usr/lib/librpc.a
-LIBRPCSVC?=	/usr/lib/librpcsvc.a
-LIBTERM?=	/usr/lib/libterm.a
-LIBUTIL?=	/usr/lib/libutil.a
+LIBCRT0?=	${DESTDIR}/usr/lib/crt0.o
+LIBC?=		${DESTDIR}/usr/lib/libc.a
+LIBCOMPAT?=	${DESTDIR}/usr/lib/libcompat.a
+LIBCRYPT?=	${DESTDIR}/usr/lib/libcrypt.a
+LIBCURSES?=	${DESTDIR}/usr/lib/libcurses.a
+LIBDBM?=	${DESTDIR}/usr/lib/libdbm.a
+LIBDES?=	${DESTDIR}/usr/lib/libdes.a
+LIBGCC?=	${DESTDIR}/usr/lib/libgcc.a
+LIBL?=		${DESTDIR}/usr/lib/libl.a
+LIBKDB?=	${DESTDIR}/usr/lib/libkdb.a
+LIBKRB?=	${DESTDIR}/usr/lib/libkrb.a
+LIBKVM?=	${DESTDIR}/usr/lib/libkvm.a
+LIBM?=		${DESTDIR}/usr/lib/libm.a
+LIBMP?=		${DESTDIR}/usr/lib/libmp.a
+LIBPC?=		${DESTDIR}/usr/lib/libpc.a
+LIBPLOT?=	${DESTDIR}/usr/lib/libplot.a
+LIBRESOLV?=	${DESTDIR}/usr/lib/libresolv.a
+LIBRPCSVC?=	${DESTDIR}/usr/lib/librpcsvc.a
+LIBSKEY?=	${DESTDIR}/usr/lib/libskey.a
+LIBTERMCAP?=	${DESTDIR}/usr/lib/libtermcap.a
+LIBUTIL?=	${DESTDIR}/usr/lib/libutil.a
 
 .if defined(SHAREDSTRINGS)
 CLEANFILES+=strings
@@ -49,31 +51,22 @@ CLEANFILES+=strings
 	@rm -f x.C
 .endif
 
-.if defined(PROG)
-.if defined(SRCS)
-
-OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
-
-.if defined(LDONLY)
 
-${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD}
-	${LD} ${LDFLAGS} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDADD}
+.if defined(PROG)
+SRCS?=	${PROG}.c
+.if !empty(SRCS:N*.h:N*.sh)
+OBJS+=  ${SRCS:N*.h:N*.sh:R:S/$/.o/g}
+.endif
 
-.else defined(LDONLY)
+.if defined(DESTDIR)
 
 ${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
-
-.endif
+	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${OBJS} ${LDADD} -lgcc -lc -lgcc
 
 .else
 
-SRCS=	${PROG}.c
-
-${PROG}: ${SRCS} ${LIBC} ${DPADD}
-	${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD}
-
-MKDEP=	-p
+${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD}
+	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
 
 .endif
 
@@ -85,21 +78,18 @@ MAN1=	${PROG}.0
 .endif
 
 .MAIN: all
-all: ${PROG}
+all: ${PROG} _SUBDIRUSE
 
 .if !target(clean)
-clean:
-	rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES}
+clean: _SUBDIRUSE
+	rm -f a.out [Ee]rrs mklog core *.core ${PROG} ${OBJS} ${CLEANFILES}
 .endif
 
-cleandir: clean
+cleandir: _SUBDIRUSE clean
 
 .if !target(install)
 .if !target(beforeinstall)
 beforeinstall:
-.if defined(DESTDIR) || defined(BINDIR)
-	@install -d -o root -g wheel -m 755 ${DESTDIR}${BINDIR}
-.endif
 .endif
 .if !target(afterinstall)
 afterinstall:
@@ -112,8 +102,7 @@ realinstall:
 	    ${PROG} ${DESTDIR}${BINDIR}
 .endif
 .if defined(HIDEGAME)
-	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \
-	    chown games.bin ${PROG})
+	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG})
 .endif
 .endif
 
@@ -137,7 +126,7 @@ realinstall: beforeinstall
 .endif
 
 .if !target(lint)
-lint: ${SRCS}
+lint: ${SRCS} _SUBDIRUSE
 .if defined(PROG)
 	@${LINT} ${LINTFLAGS} ${CFLAGS} ${.ALLSRC} | more 2>&1
 .endif