14 files changed, 29 insertions, 29 deletions

diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index b7cefe8847e8..d981fb11054e 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -3,9 +3,9 @@
 .include <src.opts.mk>
 MK_SSP=		no
 
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
-GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
-CCDIR=	${.CURDIR}/../../usr.bin/cc
+GCCDIR=	${SRCTOP}/contrib/gcc
+GCCLIB=	${SRCTOP}/contrib/gcclibs
+CCDIR=	${SRCTOP}/gnu/usr.bin/cc
 .include "${CCDIR}/Makefile.tgt"
 .include "${CCDIR}/cc_tools/Makefile.hdrs"
 
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 1df11ec3640e..c9ecd41ab313 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-DIALOG=		${.CURDIR}/../../../contrib/dialog
+DIALOG=		${SRCTOP}/contrib/dialog
 
 LIB=		dialog
 SHLIB_MAJOR=	8
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index 740b1101e5a6..58c765515a6e 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -5,9 +5,9 @@ MK_SSP=		no
 
 .include <src.opts.mk>
 
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
-GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
-CCDIR=	${.CURDIR}/../../usr.bin/cc
+GCCDIR=	${SRCTOP}/contrib/gcc
+GCCLIB=	${SRCTOP}/contrib/gcclibs
+CCDIR=	${SRCTOP}/gnu/usr.bin/cc
 .include "${CCDIR}/Makefile.tgt"
 .include "${CCDIR}/cc_tools/Makefile.hdrs"
 
diff --git a/gnu/lib/libgomp/Makefile b/gnu/lib/libgomp/Makefile
index b4abf7958bcc..5a97172aad7e 100644
--- a/gnu/lib/libgomp/Makefile
+++ b/gnu/lib/libgomp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
-GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
+GCCDIR=	${SRCTOP}/contrib/gcc
+GCCLIB=	${SRCTOP}/contrib/gcclibs
 SRCDIR=	${GCCLIB}/libgomp
 
 .PATH: ${SRCDIR} ${SRCDIR}/config/posix
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
index 992f9295294d..a25615429a20 100644
--- a/gnu/lib/libreadline/Makefile.inc
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -3,7 +3,7 @@
 SHLIB_MAJOR=8
 RL_LIBRARY_VERSION=5.2
 
-SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
+SRCDIR= ${SRCTOP}/contrib/libreadline
 .PATH: ${SRCDIR} ${.CURDIR}/..
 
 LOCAL_CFLAGS= -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 69044e767d7b..b775b74d75ae 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -3,7 +3,7 @@
 LIB=		gnuregex
 SHLIB_MAJOR=	5
 
-REGEXDIR=	${.CURDIR}/../../../contrib/libgnuregex
+REGEXDIR=	${SRCTOP}/contrib/libgnuregex
 .PATH:		${REGEXDIR}
 
 SRCS=		gnuregex.c
diff --git a/gnu/lib/libssp/Makefile b/gnu/lib/libssp/Makefile
index 5a41298360ea..e611f5dfee45 100644
--- a/gnu/lib/libssp/Makefile
+++ b/gnu/lib/libssp/Makefile
@@ -7,8 +7,8 @@ MK_SSP=		no
 
 .include <bsd.own.mk>
 
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
-GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
+GCCDIR=	${SRCTOP}/contrib/gcc
+GCCLIB=	${SRCTOP}/contrib/gcclibs
 SRCDIR=	${GCCLIB}/libssp
 
 .PATH: ${SRCDIR} ${SRCDIR}/ssp
diff --git a/gnu/lib/libssp/libssp_nonshared/Makefile b/gnu/lib/libssp/libssp_nonshared/Makefile
index b8b6fcf18823..64bc98f82ef8 100644
--- a/gnu/lib/libssp/libssp_nonshared/Makefile
+++ b/gnu/lib/libssp/libssp_nonshared/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-GCCDIR=	${.CURDIR}/../../../../contrib/gcc
-GCCLIB=	${.CURDIR}/../../../../contrib/gcclibs
+GCCDIR=	${SRCTOP}/contrib/gcc
+GCCLIB=	${SRCTOP}/contrib/gcclibs
 
 .PATH: ${GCCLIB}/libssp ${GCCLIB}/libssp/ssp
 
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 27f323652288..8c4972db4c41 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -3,9 +3,9 @@
 .include <src.opts.mk>
 
 GCCVER=	4.2
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
-GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
-SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
+GCCDIR=	${SRCTOP}/contrib/gcc
+GCCLIB=	${SRCTOP}/contrib/gcclibs
+SRCDIR=	${SRCTOP}/contrib/libstdc++
 SUPDIR=	${SRCDIR}/libsupc++
 
 .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 3f053948bada..5a79eaf7b4f3 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -8,8 +8,8 @@
 __CC_MAKEFILE_INC__= ${MFILE}
 
 GCCVER=	4.2
-GCCDIR=	${.CURDIR}/../../../../contrib/gcc
-GCCLIB=	${.CURDIR}/../../../../contrib/gcclibs
+GCCDIR=	${SRCTOP}/contrib/gcc
+GCCLIB=	${SRCTOP}/contrib/gcclibs
 
 .include "Makefile.tgt"
 
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index bcca48a7a722..1d749b9ef374 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -6,7 +6,7 @@
 
 INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
 
-.PATH: ${GCCDIR}/config/${GCC_CPU} ${.CURDIR}/../../../../contrib/llvm/tools/clang/lib/Headers
+.PATH: ${GCCDIR}/config/${GCC_CPU} ${SRCTOP}/contrib/llvm/tools/clang/lib/Headers
 
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 INCS=	ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index ae1f1ab0af8f..bcca9b353303 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-DIALOG=	${.CURDIR}/../../../contrib/dialog
+DIALOG=	${SRCTOP}/contrib/dialog
 PROG=   dialog
 
 LIBADD=	dialog ncursesw m
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 6e9f8670d193..7e72487bed00 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-DIFFSRC=${.CURDIR}/../../../contrib/diff/src
+DIFFSRC=${SRCTOP}/contrib/diff/src
 .PATH:  ${DIFFSRC} \
-	${.CURDIR}/../../../contrib/diff/lib \
-	${.CURDIR}/../../../contrib/diff/man
+	${SRCTOP}/contrib/diff/lib \
+	${SRCTOP}/contrib/diff/man
 
 PROG=		diff3
 SRCS=           diff3.c version-etc.c \
@@ -12,9 +12,9 @@ SRCS=           diff3.c version-etc.c \
 # Important for ctype macros!
 CFLAGS+=-funsigned-char
 
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
+CFLAGS+=-I${SRCTOP}/contrib/diff/
+CFLAGS+=-I${SRCTOP}/contrib/diff/src
+CFLAGS+=-I${SRCTOP}/contrib/diff/lib
 CFLAGS+=-DHAVE_CONFIG_H
 CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
 
diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index 514d725cdc15..6f518e5c8625 100644
--- a/gnu/usr.bin/gperf/Makefile
+++ b/gnu/usr.bin/gperf/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
-GPERFDIR=	${.CURDIR}/../../../contrib/gperf
+GPERFDIR=	${SRCTOP}/contrib/gperf
 
 .PATH: ${GPERFDIR}/src ${GPERFDIR}/lib ${GPERFDIR}/doc