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.156
retrieving revision 1.161
diff -u -p -r1.156 -r1.161
--- src/share/mk/bsd.prog.mk	2002/08/09 00:21:22	1.156
+++ src/share/mk/bsd.prog.mk	2002/11/12 14:33:49	1.161
@@ -1,7 +1,8 @@
-#	$NetBSD: bsd.prog.mk,v 1.156 2002/08/09 00:21:22 thorpej Exp $
+#	$NetBSD: bsd.prog.mk,v 1.161 2002/11/12 14:33:49 itohy 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
@@ -43,7 +44,8 @@ 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 \
@@ -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)
@@ -118,16 +128,27 @@ _SUPCXX=	-lstdc++ -lm
 _CCLINK=	${CC}
 .endif
 
+.gdbinit:
+	rm -f .gdbinit
+.if defined(DESTDIR) && !empty(DESTDIR)
+	echo "set solib-absolute-prefix ${DESTDIR}" > .gdbinit
+.else
+	touch .gdbinit
+.endif
+.for __gdbinit in ${GDBINIT}
+	echo "source ${__gdbinit}" >> .gdbinit
+.endfor
+
 .if defined(DESTDIR)
 
-${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${PROG})
 	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND}
 .endif
 
 .else
 
-${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
+${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${PROG})
 	${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
 .endif
@@ -143,7 +164,7 @@ MAN=	${PROG}.1
 realall: ${PROG} ${SCRIPTS}
 
 cleanprog: cleanobjs cleanextra
-	rm -f a.out [Ee]rrs mklog core *.core ${PROG}
+	rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}
 
 cleanobjs:
 .if defined(OBJS) && !empty(OBJS)
@@ -171,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
@@ -204,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)