Index: head/usr.sbin/traceroute/Makefile
===================================================================
--- head/usr.sbin/traceroute/Makefile	(revision 314458)
+++ head/usr.sbin/traceroute/Makefile	(revision 314459)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
-TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
+TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
 
 PROG=	traceroute
 MAN=	traceroute.8
 SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c
 BINOWN=	root
 BINMODE=4555
 CLEANFILES=	version.c
 
 CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 \
 	 -DHAVE_NET_ROUTE_H=1 -DHAVE_NET_IF_DL_H=1 \
 	 -DHAVE_STRERROR=1 -DHAVE_USLEEP=1 \
 	 -DHAVE_SYS_SYSCTL_H=1 -DBYTESWAP_IP_HDR=1 \
 	 -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \
 	 -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_ICMP_NEXTMTU=1
 .if !defined(TRACEROUTE_NO_IPSEC)
 CFLAGS+= -DIPSEC
 .endif
 # RTT Jitter on the internet these days means printing 3 decimal places on
 # > 1000ms times is plain useless.  Uncomment this to enable variable precision
 # reporting, ie: print a variable precision from 0.001ms through 1000ms
 # CFLAGS+= -DSANE_PRECISION
 
 .if !defined(TRACEROUTE_NO_IPSEC)
 LIBADD+=	ipsec
 .endif
 
 .if ${MK_CASPER} != "no"
 LIBADD+=	casper
 LIBADD+=	cap_dns
 CFLAGS+=-DHAVE_LIBCASPER
 .endif
 
 CFLAGS+= -I${TRACEROUTE_DISTDIR}
 
 WARNS?=	3
 
 version.c: ${TRACEROUTE_DISTDIR}/VERSION
 	@rm -f ${.TARGET}
 	head -1 ${TRACEROUTE_DISTDIR}/VERSION | \
 	    sed -e 's/.*/char version[] = "&";/' \
 	    > ${.TARGET}
 
 .include <bsd.prog.mk>
Index: head/usr.sbin/traceroute6/Makefile
===================================================================
--- head/usr.sbin/traceroute6/Makefile	(revision 314458)
+++ head/usr.sbin/traceroute6/Makefile	(revision 314459)
@@ -1,32 +1,32 @@
 # Copyright (c) 1996 WIDE Project. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modifications, are permitted provided that the above copyright notice
 # and this paragraph are duplicated in all such forms and that any
 # documentation, advertising materials, and other materials related to
 # such distribution and use acknowledge that the software was developed
 # by the WIDE Project, Japan. The name of the Project may not be used to
 # endorse or promote products derived from this software without
 # specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS''
 # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
 # $FreeBSD$
 
-TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
+TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
 
 PROG=	traceroute6
 MAN=	traceroute6.8
 SRCS=	as.c traceroute6.c
 BINOWN=	root
 BINMODE= 4555
 
 CFLAGS+= -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL
 CFLAGS+= -I${.CURDIR} -I${TRACEROUTE_DISTDIR} -I.
 
 WARNS?=	3
 
 LIBADD=	ipsec
 
 .include <bsd.prog.mk>