From 606cad63e046f2873878d07634158eb90c5a2cf6 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Wed, 14 Aug 2002 06:57:08 +0000 Subject: MFC: Honor TOOLS_PREFIX. (Makes RELENG_4_6 buildable for those who do not have libcrypto.so.2 under /usr/lib and attempt to buildworld with crypto support. This became needed after the OpenSSH merge.) Approved by: re (murray) --- gnu/usr.bin/binutils/ld/Makefile | 2 +- gnu/usr.bin/binutils/ld/Makefile.alpha | 2 +- gnu/usr.bin/binutils/ld/Makefile.i386 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index 8e81c8ffd760..ed7e7e18215a 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -17,7 +17,7 @@ elf-hints.h: ln -sf ${.CURDIR}/../../../../include/${.TARGET} . .endif -CFLAGS+= -DSCRIPTDIR=\"${DESTDIR}/usr/libdata\" +CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\" CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd CFLAGS+= -DVERSION=\"${VERSION}\" -DBFD_VERSION=\"${VERSION}\" NOSHARED?= yes diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha index bfb9f60846ba..d729adb91be5 100644 --- a/gnu/usr.bin/binutils/ld/Makefile.alpha +++ b/gnu/usr.bin/binutils/ld/Makefile.alpha @@ -6,7 +6,7 @@ HOST= alpha-unknown-freebsd CFLAGS+= -DDEFAULT_EMULATION=\"elf64alpha\" CFLAGS+= -DTARGET=\"alpha-unknown-freebsd\" -_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 6e4a4fafa5ed..5c116a1031aa 100644 --- a/gnu/usr.bin/binutils/ld/Makefile.i386 +++ b/gnu/usr.bin/binutils/ld/Makefile.i386 @@ -6,7 +6,7 @@ HOST= i386-unknown-freebsd CFLAGS+= -DDEFAULT_EMULATION=\"elf_i386\" CFLAGS+= -DTARGET=\"i386-unknown-freebsd\" -_i386_path= \"/usr/lib\" +_i386_path= \"${TOOLS_PREFIX}/usr/lib\" .else _i386_path= \"/usr/cross/i386-freebsd/usr/lib\" .endif -- cgit v1.2.3