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.157
retrieving revision 1.163
diff -u -p -r1.157 -r1.163
--- src/share/mk/bsd.prog.mk	2002/09/08 03:59:02	1.157
+++ src/share/mk/bsd.prog.mk	2003/01/24 02:06:37	1.163
@@ -1,7 +1,8 @@
-#	$NetBSD: bsd.prog.mk,v 1.157 2002/09/08 03:59:02 thorpej Exp $
+#	$NetBSD: bsd.prog.mk,v 1.163 2003/01/24 02:06:37 thorpej Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .include <bsd.init.mk>
+.include <bsd.shlib.mk>
 
 ##### Basic targets
 .PHONY:		cleanextra cleanobjs cleanprog proginstall scriptsinstall
@@ -16,14 +17,14 @@ CFLAGS+=	${COPTS}
 CFLAGS+=	-mcmodel=medlow
 .endif
 
-# ELF platforms depend on crtbegin.o and crtend.o
+# ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
 .if ${OBJECT_FMT} == "ELF"
 .ifndef LIBCRTBEGIN
-LIBCRTBEGIN=	${DESTDIR}/usr/lib/crtbegin.o
+LIBCRTBEGIN=	${DESTDIR}/usr/lib/crti.o ${DESTDIR}/usr/lib/crtbegin.o
 .MADE: ${LIBCRTBEGIN}
 .endif
 .ifndef LIBCRTEND
-LIBCRTEND=	${DESTDIR}/usr/lib/crtend.o
+LIBCRTEND=	${DESTDIR}/usr/lib/crtend.o ${DESTDIR}/usr/lib/crtn.o
 .MADE: ${LIBCRTEND}
 .endif
 _SHLINKER=	${SHLINKDIR}/ld.elf_so
@@ -43,11 +44,12 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 #     etc..
 #
 __bsd_prog_mk_system_libs?= \
-	BZ2 C C_PIC CDK COM_ERR COMPAT CRYPT CRYPTO CRYPTO_RC5 CRYPTO_IDEA \
+	BZ2 C C_PIC CDK COM_ERR COMPAT CRYPT CRYPTO CRYPTO_IDEA CRYPTO_MDC2 \
+	CRYPTO_RC5 \
 	CURSES DBM DES EDIT FORM GCC GNUMALLOC GSSAPI HDB INTL IPSEC \
 	KADM KADM5CLNT KADM5SRV KAFS KDB KRB KRB5 KSTREAM KVM L M MENU \
-	OBJC OSSAUDIO PCAP PCI PMC POSIX RESOLV RMT ROKEN RPCSVC SKEY SS SSL \
-	SL TERMCAP TELNET USBHID UTIL WRAP Y Z
+	OBJC OSSAUDIO PCAP PCI PMC POSIX PTHREAD PTHREAD_DBG RESOLV RMT \
+	ROKEN RPCSVC RT SKEY SS SSL SL TERMCAP TELNET USBHID UTIL WRAP Y Z
 
 .for _n in ${__bsd_prog_mk_system_libs}
 .ifndef LIB${_n}
@@ -103,12 +105,20 @@ LOBJS+=		${LSRCS:.c=.ln} ${SRCS:M*.c:.c=
 
 _PROGLDOPTS=
 .if ${SHLINKDIR} != "/usr/libexec"	# XXX: change or remove if ld.so moves
+.if ${OBJECT_FMT} == "ELF"
 _PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHLINKER}
 .endif
+.if ${OBJECT_FMT} == "a.out"
+LIBCRT0=	${DESTDIR}/lib/crt0.o
+.endif
+.endif
 .if ${SHLIBDIR} != ${LIBDIR}
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
 		-Wl,-rpath,${SHLIBDIR}:/usr/lib \
 		-L${DESTDIR}${SHLIBDIR}
+.elif ${SHLIBINSTALLDIR} != ${LIBDIR}
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
+		-L${DESTDIR}${SHLIBINSTALLDIR}
 .endif
 
 .if defined(PROG_CXX)
@@ -182,7 +192,7 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROG
 
 __proginstall: .USE
 	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
+		${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
 .if !defined(UPDATE)
 ${DESTDIR}${BINDIR}/${PROGNAME}! ${PROG} __proginstall
@@ -215,7 +225,7 @@ __scriptinstall: .USE
 	    -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
 	    -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
 	    -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
-	    ${.ALLSRC} ${.TARGET}
+	    ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
 .for S in ${SCRIPTS:O:u}
 .if !defined(UPDATE)