--- src/etc/Makefile	2005/09/25 15:30:26	1.95
+++ src/etc/Makefile	2005/10/19 05:18:36	1.96
@@ -124,10 +124,9 @@ upgrade_etc:	preupgrade
 	mkdir -p ${DESTDIR}/etc/rc.d
 	cd ${UPGRADE_SRCDIR}/rc.d; ${MAKE} install 
 	# "../share/termcap/make etc-termap" expanded inline here:
-	${LN} -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
+	${LN} -fs ${DESTDIR}/usr/share/misc/termcap ${DESTDIR}/etc/termcap
 	# "../usr.sbin/rmt/make etc-rmt" expanded inline here:
-	rm -f ${DESTDIR}/etc/rmt
-	${LN} -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt
+	${LN} -fs ${DESTDIR}/usr/sbin/rmt ${DESTDIR}/etc/rmt
 .if !defined(BINARY_UPGRADE) # XXX not yet handled by binary upgrade
 .if !defined(NO_SENDMAIL)
 	cd ${UPGRADE_SRCDIR}/sendmail; ${MAKE} upgrade