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.121
retrieving revision 1.132
diff -u -p -r1.121 -r1.132
--- src/share/mk/bsd.prog.mk	2001/01/04 23:52:00	1.121
+++ src/share/mk/bsd.prog.mk	2001/08/14 07:02:13	1.132
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.121 2001/01/04 23:52:00 garbled Exp $
+#	$NetBSD: bsd.prog.mk,v 1.132 2001/08/14 07:02:13 tv Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .if !target(__initialized__)
@@ -14,7 +14,7 @@ __initialized__:
 
 .PHONY:		cleanprog proginstall scriptsinstall
 realinstall:	proginstall scriptsinstall
-clean cleandir distclean: cleanprog
+clean:		cleanprog
 
 CFLAGS+=	${COPTS}
 
@@ -37,6 +37,8 @@ LIBCOM_ERR?=	${DESTDIR}/usr/lib/libcom_e
 LIBCOMPAT?=	${DESTDIR}/usr/lib/libcompat.a
 LIBCRYPT?=	${DESTDIR}/usr/lib/libcrypt.a
 LIBCRYPTO?=	${DESTDIR}/usr/lib/libcrypto.a
+LIBCRYPTO_RC5?=	${DESTDIR}/usr/lib/libcrypto_rc5.a
+LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a
 LIBCURSES?=	${DESTDIR}/usr/lib/libcurses.a
 LIBDBM?=	${DESTDIR}/usr/lib/libdbm.a
 LIBDES?=	${DESTDIR}/usr/lib/libdes.a
@@ -70,6 +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/libssl.a
 LIBSL?=		${DESTDIR}/usr/lib/libsl.a
 LIBTERMCAP?=	${DESTDIR}/usr/lib/libtermcap.a
 LIBTELNET?=	${DESTDIR}/usr/lib/libtelnet.a
@@ -119,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)
@@ -140,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:/' \
@@ -190,7 +197,7 @@ __scriptinstall: .USE
 	    -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
 	    ${.ALLSRC} ${.TARGET}
 
-.for S in ${SCRIPTS}
+.for S in ${SCRIPTS:O:u}
 .if !defined(BUILD) && !make(all) && !make(${S})
 ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE
 .endif