diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index d15f96d05fac..9e64f926e89d 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 TARGET_TUPLE?=	alpha-unknown-freebsd
 
 .if ${TARGET_ARCH} == "alpha"
 NATIVE_EMULATION=	elf64alpha_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_alpha_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
+_alpha_path=	\"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _alpha_path=	\"/usr/cross/alpha-freebsd/usr/lib\"
 .endif
 EMS+=		${NATIVE_EMULATION} elf64alpha alpha
 LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
 		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu alpha.x alpha.xbn \
 		alpha.xn alpha.xr alpha.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
 SRCS+=	e${NATIVE_EMULATION}.c eelf64alpha.c ealpha.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c eelf64alpha.c ealpha.c
 
 e${NATIVE_EMULATION}.c:	emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    ${NATIVE_EMULATION} ""  ${NATIVE_EMULATION} ${TARGET_TUPLE}
 
 eelf64alpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    elf64alpha ""  elf64alpha ${TARGET_TUPLE}
 
 ealpha.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    ${NATIVE_EMULATION} ""  alpha ${TARGET_TUPLE}
diff --git a/gnu/usr.bin/binutils/ld/Makefile.amd64 b/gnu/usr.bin/binutils/ld/Makefile.amd64
index 3e63a8f516ce..cbb243370701 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.amd64
+++ b/gnu/usr.bin/binutils/ld/Makefile.amd64
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 TARGET_TUPLE?=	x86_64-obrien-freebsd
 
 NATIVE_EMULATION=	elf_x86_64_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_amd64_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
+_amd64_path=	\"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\"
 EMS+=		${NATIVE_EMULATION}
 LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
 		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
 SRCS+=	e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
 
 e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_amd64_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}"
 
 X86_EMULATION=	elf_i386_fbsd
 _i386_path=	\"${TOOLS_PREFIX}/usr/lib/i386\"
 EMS+=		${X86_EMULATION}
 LDSCRIPTS+=	${X86_EMULATION}.x ${X86_EMULATION}.xbn ${X86_EMULATION}.xn ${X86_EMULATION}.xr \
 		${X86_EMULATION}.xs ${X86_EMULATION}.xu ${X86_EMULATION}.xc ${X86_EMULATION}.xsc
 SRCS+=		e${X86_EMULATION}.c
 CLEANFILES+=	e${X86_EMULATION}.c
 
 e${X86_EMULATION}.c: emulparams/${X86_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    "${X86_EMULATION}" "" ${X86_EMULATION} "${TARGET_TUPLE}"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index b959aaf356be..d21ee42fcc62 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 TARGET_TUPLE?=	i386-unknown-freebsd
 
 .if ${TARGET_ARCH} == "i386"
 NATIVE_EMULATION=	elf_i386_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_i386_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
+_i386_path=	\"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _i386_path=	\"/usr/cross/i386-freebsd/usr/lib\"
 .endif
 EMS+=		${NATIVE_EMULATION}
 LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
 		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
 SRCS+=	e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
 
 e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}"
 
 .if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
 EMS+=		i386pe
 LDSCRIPTS+=	i386pe.x	\
 		i386pe.xbn	\
 		i386pe.xn	\
 		i386pe.xr	\
 		i386pe.xu
 SRCS+=	ei386pe.c
 CLEANFILES+=	ei386pe.c
 
 ei386pe.c: emulparams/i386pe.sh emultempl/pe.em scripttempl/pe.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/winnt/lib ${HOST} ${TARGET_TUPLE}winnt \
 	    ${TARGET_TUPLE}winnt i386pe "" i386pe \
 	    ${TARGET_TUPLE}winnt
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.ia64 b/gnu/usr.bin/binutils/ld/Makefile.ia64
index d5d3d1c7a792..d10937d391ed 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.ia64
+++ b/gnu/usr.bin/binutils/ld/Makefile.ia64
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 TARGET_TUPLE?=	ia64-unknown-freebsd
 
 .if ${TARGET_ARCH} == "ia64"
 NATIVE_EMULATION=	elf64_ia64_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_ia64_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
+_ia64_path=	\"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _ia64_path=	\"/usr/cross/ia64-freebsd/usr/lib\"
 .endif
 
 EMS+=		${NATIVE_EMULATION}
 LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
 		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
 
 SRCS+=	e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
 e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_ia64_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}"
 
 SRCS+=	eelf64_ia64.c
 CLEANFILES+=	eelf64_ia64.c
 eelf64_ia64.c: emulparams/elf64_ia64.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_ia64_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    "elf64_ia64" "" elf64_ia64 ${TARGET_TUPLE}
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index ee5a258a6aa6..12a2bac24f91 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -1,29 +1,29 @@
 # $FreeBSD$
 
 TARGET_TUPLE?=	powerpc-unknown-freebsd
 
 .if ${TARGET_ARCH} == "powerpc"
 NATIVE_EMULATION=	elf32ppc
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_powerpc_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
+_powerpc_path=	\"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _powerpc_path=	\"/usr/cross/powerpc-freebsd/usr/lib\"
 .endif
 EMS+=		${NATIVE_EMULATION}
 LDSCRIPTS+=	${NATIVE_EMULATION}.x	\
 		${NATIVE_EMULATION}.xbn	\
 		${NATIVE_EMULATION}.xn	\
 		${NATIVE_EMULATION}.xr	\
 		${NATIVE_EMULATION}.xs	\
 		${NATIVE_EMULATION}.xu	\
 		${NATIVE_EMULATION}.xsc
 SRCS+=		e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
 
 e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_powerpc_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    ${NATIVE_EMULATION} ""  ${NATIVE_EMULATION} ${TARGET_TUPLE}
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc64 b/gnu/usr.bin/binutils/ld/Makefile.sparc64
index 9b7f7fd9b406..ab39e596a115 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc64
@@ -1,43 +1,43 @@
 # $FreeBSD$
 
 TARGET_TUPLE?=	sparc64-unknown-freebsd
 
 .if ${TARGET_ARCH} == "sparc64"
 NATIVE_EMULATION=	elf64_sparc_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_sparc_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
+_sparc_path=	\"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _sparc_path=	\"/usr/cross/sparc-freebsd/usr/lib\"
 .endif
 
 EMS+=		${NATIVE_EMULATION} elf64_sparc
 LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
 		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
 SRCS+=		e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
 
 e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_sparc_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    ${NATIVE_EMULATION} "" ${NATIVE_EMULATION} ${TARGET_TUPLE}
 
 .for BITS in 64 32
 
 EMS+=		elf${BITS}_sparc
 LDSCRIPTS+=	elf${BITS}_sparc.x elf${BITS}_sparc.xbn elf${BITS}_sparc.xn \
 		elf${BITS}_sparc.xr \
 		elf${BITS}_sparc.xs elf${BITS}_sparc.xu elf${BITS}_sparc.xc \
 		elf${BITS}_sparc.xsc
 SRCS+=		eelf${BITS}_sparc.c
 CLEANFILES+=	eelf${BITS}_sparc.c
 
 eelf${BITS}_sparc.c: emulparams/elf${BITS}_sparc.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_sparc_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    elf${BITS}_sparc "" elf${BITS}_sparc ${TARGET_TUPLE}
 
 .endfor	# BITS