Set the SCRIPTDIR to be rooted at TOOLS_PREFIX rather than DESTDIR.

(the two may be different (ie, build vs. runtime))
Allow ldscript's SEARCH_DIR do be rooted somewhere other than `/'.
(in this case at TOOLS_PREFIX)

These changes are most helpful during `make buildworld' so that the shared
libs built in the middle of `make buildworld' are used vs. the ones in
/usr/lib on the build machine.

Submitted by:	ru

7 files changed, 7 insertions, 7 deletions

diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 3f68923..04090ec 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -18,7 +18,7 @@ elf-hints.h:
 	ln -sf ${.CURDIR}/../../../../include/${.TARGET} .
 .endif
 
-CFLAGS+= -DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
+CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
 NOSHARED?= yes
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 1178482..3a23767 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -6,7 +6,7 @@ TARGET_TUPLE?=	alpha-unknown-freebsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"elf64alpha\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_alpha_path=	\"/usr/lib\"
+_alpha_path=	\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _alpha_path=	\"/usr/cross/alpha-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 2053a71..3209fd5 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -6,7 +6,7 @@ TARGET_TUPLE?=	i386-unknown-freebsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"elf_i386\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_i386_path=	\"/usr/lib\"
+_i386_path=	\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _i386_path=	\"/usr/cross/i386-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.ia64 b/gnu/usr.bin/binutils/ld/Makefile.ia64
index 09c3913..594412f 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.ia64
+++ b/gnu/usr.bin/binutils/ld/Makefile.ia64
@@ -6,7 +6,7 @@ TARGET_TUPLE?=	ia64-unknown-freebsd
 HOST=	${TARGET_TUPLE}	# do what?? how does this work for a cross-build??
 CFLAGS+= -DDEFAULT_EMULATION=\"elf64_ia64\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_ia64_path=	\"/usr/lib\"
+_ia64_path=	\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _ia64_path=	\"/usr/cross/ia64-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.m68k b/gnu/usr.bin/binutils/ld/Makefile.m68k
index a81c33a..4b6e9c7 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.m68k
+++ b/gnu/usr.bin/binutils/ld/Makefile.m68k
@@ -4,7 +4,7 @@
 HOST=	m68k-unknown-freebsd
 CFLAGS+= -DDEFAULT_EMULATION=\"elf_m68k\"
 CFLAGS+= -DTARGET=\"m68k-unknown-freebsd\"
-_m68k_path=	\"/usr/lib\"
+_m68k_path=	\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _m68k_path=	\"/usr/cross/m68k-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index ad6b63a..e728098 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -6,7 +6,7 @@ TARGET_TUPLE?=	powerpc-unknown-freebsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"elf_powerpc\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_powerpc_path=	\"/usr/lib\"
+_powerpc_path=	\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _powerpc_path=	\"/usr/cross/powerpc-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc64 b/gnu/usr.bin/binutils/ld/Makefile.sparc64
index 85fc16c..ccee0cb 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc64
@@ -6,7 +6,7 @@ TARGET_TUPLE?=	sparc64-unknown-freebsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"elf32_sparc\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_sparc_path=	\"/usr/lib\"
+_sparc_path=	\"${TOOLS_PREFIX}/usr/lib\"
 .else
 _sparc_path=	\"/usr/cross/sparc-freebsd/usr/lib\"
 .endif