[src/trunk]: src/tools Move the setting of DESTDIR from the environment to th...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b74a8b9d68a4
branches:  trunk
changeset: 515922:b74a8b9d68a4
user:      tv <tv%NetBSD.org@localhost>
date:      Mon Oct 08 22:19:55 2001 +0000

description:
Move the setting of DESTDIR from the environment to the command line, deals
with DESTDIR being set on the command line at the top level (as per MAKEFLAGS
propagation in newer make(1) sources).

diffstat:

 tools/texinfo/Makefile   |  10 +++++-----
 tools/toolchain/Makefile |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (57 lines):

diff -r b9d632559b72 -r b74a8b9d68a4 tools/texinfo/Makefile
--- a/tools/texinfo/Makefile    Mon Oct 08 22:11:31 2001 +0000
+++ b/tools/texinfo/Makefile    Mon Oct 08 22:19:55 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2001/10/04 17:55:16 tv Exp $
+#      $NetBSD: Makefile,v 1.3 2001/10/08 22:19:55 tv Exp $
 
 .include <bsd.own.mk>  # for TOOLDIR
 
@@ -30,14 +30,14 @@
 
 texinfo.all: texinfo.configure
        cd texinfo && \
-               PATH="${TOOLDIR}/bin:$$PATH" DESTDIR= \
-               ${MAKE} all LEX=true BISON=true
+               PATH="${TOOLDIR}/bin:$$PATH" \
+               ${MAKE} all LEX=true BISON=true DESTDIR=
 
 texinfo.install:
 .for d in makeinfo util
        cd texinfo/${d} && \
-               PATH="${TOOLDIR}/bin:$$PATH" DESTDIR= \
-               ${MAKE} install LEX=true BISON=true
+               PATH="${TOOLDIR}/bin:$$PATH" \
+               ${MAKE} install LEX=true BISON=true DESTDIR=
 .endfor
 
 texinfo.clean:
diff -r b9d632559b72 -r b74a8b9d68a4 tools/toolchain/Makefile
--- a/tools/toolchain/Makefile  Mon Oct 08 22:11:31 2001 +0000
+++ b/tools/toolchain/Makefile  Mon Oct 08 22:19:55 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2001/10/06 16:38:04 bjh21 Exp $
+#      $NetBSD: Makefile,v 1.5 2001/10/08 22:19:55 tv Exp $
 
 .include <bsd.own.mk>  # for TOOLDIR
 
@@ -50,15 +50,15 @@
 
 toolchain.all: toolchain.configure
        cd toolchain && \
-               MACHINE= PATH="${TOOLDIR}/bin:$$PATH" DESTDIR= \
+               MACHINE= PATH="${TOOLDIR}/bin:$$PATH" \
                ${MAKE} all-binutils all-gas all-ld all-gcc \
-               LEX=true BISON=true
+               LEX=true BISON=true DESTDIR=
 
 toolchain.install:
        cd toolchain && \
-               PATH="${TOOLDIR}/bin:$$PATH" DESTDIR= \
+               PATH="${TOOLDIR}/bin:$$PATH" \
                ${MAKE} install-binutils install-gas install-ld install-gcc \
-               LEX=true BISON=true
+               LEX=true BISON=true DESTDIR=
        mv ${TOOLDIR}/bin/cpp ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cpp
 
 toolchain.clean: