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.123
retrieving revision 1.129
diff -u -p -r1.123 -r1.129
--- src/share/mk/bsd.prog.mk	2001/01/08 07:41:10	1.123
+++ src/share/mk/bsd.prog.mk	2001/02/19 07:56:14	1.129
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.123 2001/01/08 07:41:10 mrg Exp $
+#	$NetBSD: bsd.prog.mk,v 1.129 2001/02/19 07:56:14 jmc Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .if !target(__initialized__)
@@ -72,7 +72,7 @@ LIBROKEN?=	${DESTDIR}/usr/lib/libroken.a
 LIBRPCSVC?=	${DESTDIR}/usr/lib/librpcsvc.a
 LIBSKEY?=	${DESTDIR}/usr/lib/libskey.a
 LIBSS?=		${DESTDIR}/usr/lib/libss.a
-LIBSSL?=	${DESTDIR}/usr/lib/liblss.a
+LIBSSL?=	${DESTDIR}/usr/lib/libssl.a
 LIBSL?=		${DESTDIR}/usr/lib/libsl.a
 LIBTERMCAP?=	${DESTDIR}/usr/lib/libtermcap.a
 LIBTELNET?=	${DESTDIR}/usr/lib/libtelnet.a
@@ -122,12 +122,16 @@ LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=
 .if defined(DESTDIR)
 
 ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+.if !commands(${PROG})
 	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib -lgcc -lc -lgcc ${LIBCRTEND}
+.endif
 
 .else
 
 ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+.if !commands(${PROG})
 	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
+.endif
 
 .endif	# defined(DESTDIR)
 .endif	# defined(OBJS) && !empty(OBJS)
@@ -143,7 +147,7 @@ cleanprog:
 	rm -f a.out [Ee]rrs mklog core *.core \
 	    ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES}
 
-.if defined(SRCS)
+.if defined(SRCS) && !target(afterdepend)
 afterdepend: .depend
 	@(TMP=/tmp/_depend$$$$; \
 	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \