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
retrieving revision 1.226.2.3
retrieving revision 1.227
diff -u -p -r1.226.2.3 -r1.227
--- src/share/mk/bsd.prog.mk	2008/10/05 20:11:24	1.226.2.3
+++ src/share/mk/bsd.prog.mk	2008/04/10 13:52:45	1.227
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.226.2.3 2008/10/05 20:11:24 mjf Exp $
+#	$NetBSD: bsd.prog.mk,v 1.227 2008/04/10 13:52:45 tsutsui Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -84,22 +84,18 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 #
 #	E.g.
 #		LIBC?=${DESTDIR}/usr/lib/libc.a
-#		LIBX11?=${DESTDIR}/usr/X11R7/lib/libX11.a
+#		LIBX11?=${DESTDIR}/usr/X11R6/lib/libX11.a
 #	etc..
 
 .for _lib in \
 	archive asn1 bluetooth bsdmalloc bz2 c c_pic cdk com_err compat \
 	crypt crypto crypto_idea crypto_mdc2 crypto_rc5 \
 	curses dbm des edit event \
-	fetch form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \
-	kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r \
+	form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \
+	kadm5clnt kadm5srv kafs krb5 kvm l \
 	m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
-	puffs radius resolv rmt roken rpcsvc rt rump rumpuser sdp skey sl ss \
-	ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \
-	\
-	rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \
-	rumpfs_lfs rumpfs_msdosfs rumpfs_nfs rumpfs_ntfs rumpfs_syspuffs \
-	rumpfs_tmpfs rumpfs_udf rumpfs_ufs
+	puffs radius resolv rmt roken rpcsvc rt sdp skey sl ss ssh ssl termcap \
+	usbhid util wrap y z bind9 dns lwres isccfg isccc isc
 .ifndef LIB${_lib:tu}
 LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib}.a
 .MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
@@ -145,7 +141,7 @@ LIBSUPCXX=	${DESTDIR}/usr/lib/libsupc++.
 	Xi Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt \
 	XTrap Xtst Xv Xxf86dga Xxf86misc Xxf86vm
 .ifndef LIB${_lib:tu}
-LIB${_lib:tu}=	${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a
+LIB${_lib:tu}=	${DESTDIR}/usr/X11R6/lib/lib${_lib}.a
 .MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
 .endif
 .endfor
@@ -161,15 +157,13 @@ _PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHL
 .endif
 .endif
 .if ${SHLIBDIR} != "/usr/lib"
-_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
 		-R${SHLIBDIR} \
 		-L${DESTDIR}${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != "/usr/lib"
-_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
+_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
 		-L${DESTDIR}${SHLIBINSTALLDIR}
 .endif
-_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}/usr/lib \
-		-L${DESTDIR}/usr/lib
 
 __proginstall: .USE
 	${_MKTARGET_INSTALL}
@@ -191,18 +185,13 @@ __progdebuginstall: .USE
 _APPEND_MANS=yes
 _APPEND_SRCS=yes
 
-_CCLINKFLAGS=
-.if defined(DESTDIR)
-_CCLINKFLAGS+=	-B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/
-.endif
-
 .if defined(PROG_CXX)
 PROG=		${PROG_CXX}
-_CCLINK=	${CXX} ${_CCLINKFLAGS}
+_CCLINK=	${CXX} # XXX Some Makefiles rely on this being public.
 .endif
 
 .if defined(PROG)
-_CCLINK?=	${CC} ${_CCLINKFLAGS}
+_CCLINK?=	${CC} # XXX Some Makefiles rely on this being public.
 .  if defined(MAN)
 MAN.${PROG}=	${MAN}
 _APPEND_MANS=	no
@@ -236,13 +225,13 @@ PROGS=		${PROG}
 # Definitions specific to C programs.
 .for _P in ${PROGS}
 SRCS.${_P}?=	${_P}.c
-_CCLINK.${_P}=	${CC} ${_CCLINKFLAGS}
+_CCLINK.${_P}=	${CC}
 .endfor
 
 # Definitions specific to C++ programs.
 .for _P in ${PROGS_CXX}
 SRCS.${_P}?=	${_P}.cc
-_CCLINK.${_P}=	${CXX} ${_CCLINKFLAGS}
+_CCLINK.${_P}=	${CXX}
 .endfor
 
 # Language-independent definitions.
@@ -299,18 +288,18 @@ ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
 ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${_P})
 	${_MKTARGET_LINK}
-	${_CCLINK.${_P}} \
-	    ${DESTDIR:D-Wl,-nostdlib} \
-	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \
+.if defined(DESTDIR)
+	${_CCLINK.${_P}} -Wl,-nostdlib \
+	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
+	    -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/  \
 	    ${OBJS.${_P}} ${_LDADD.${_P}} \
-	    ${DESTDIR:D-L${_GCC_LIBGCCDIR}} \
-	    ${_PROGLDOPTS}
+	    -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib
+.else
+	${_CCLINK.${_P}} ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS.${_P}} ${_LDADD.${_P}}
+.endif	# defined(DESTDIR)
 .if defined(PAXCTL_FLAGS.${_P})
 	${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
 .endif
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
 .endif	# !commands(${_P})
 
 ${_P}.ro: ${OBJS.${_P}} ${DPADD}