From 848b7208e8f1e9d4899321bcfb9ba75bdb6bcd8a Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 4 Oct 2001 17:52:27 +0000 Subject: [PATCH] Clear DESTDIR from the environment when invoking make on the toolchain's GNU makefiles. Some of these tools are (amazingly) DESTDIR aware, but we don't want that handling for host tools. Fixes PR bin/14079. --- tools/texinfo/Makefile | 6 +++--- tools/toolchain/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/texinfo/Makefile b/tools/texinfo/Makefile index e5de2e9ef6c7..07c6c0a19ec9 100644 --- a/tools/texinfo/Makefile +++ b/tools/texinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2001/08/14 11:02:03 tv Exp $ +# $NetBSD: Makefile,v 1.2 2001/10/04 17:55:16 tv Exp $ .include # for TOOLDIR @@ -30,13 +30,13 @@ texinfo.configure: texinfo.all: texinfo.configure cd texinfo && \ - PATH="${TOOLDIR}/bin:$$PATH" \ + PATH="${TOOLDIR}/bin:$$PATH" DESTDIR= \ ${MAKE} all LEX=true BISON=true texinfo.install: .for d in makeinfo util cd texinfo/${d} && \ - PATH="${TOOLDIR}/bin:$$PATH" \ + PATH="${TOOLDIR}/bin:$$PATH" DESTDIR= \ ${MAKE} install LEX=true BISON=true .endfor diff --git a/tools/toolchain/Makefile b/tools/toolchain/Makefile index 9869a8548cb3..64f28580a762 100644 --- a/tools/toolchain/Makefile +++ b/tools/toolchain/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/09/21 23:00:36 tv Exp $ +# $NetBSD: Makefile,v 1.3 2001/10/04 17:52:27 tv Exp $ .include # for TOOLDIR @@ -50,13 +50,13 @@ toolchain.configure: toolchain.all: toolchain.configure cd toolchain && \ - PATH="${TOOLDIR}/bin:$$PATH" \ + PATH="${TOOLDIR}/bin:$$PATH" DESTDIR= \ ${MAKE} all-binutils all-gas all-ld all-gcc \ LEX=true BISON=true toolchain.install: cd toolchain && \ - PATH="${TOOLDIR}/bin:$$PATH" \ + PATH="${TOOLDIR}/bin:$$PATH" DESTDIR= \ ${MAKE} install-binutils install-gas install-ld install-gcc \ LEX=true BISON=true mv ${TOOLDIR}/bin/cpp ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cpp