[src/trunk]: src When providing a default DESTDIR & RELEASEDIR in non-expert ...

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

details:   https://anonhg.NetBSD.org/src/rev/1dbc3d5d1eee
branches:  trunk
changeset: 546938:1dbc3d5d1eee
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri May 09 09:10:06 2003 +0000

description:
When providing a default DESTDIR & RELEASEDIR in non-expert mode, add
these to makeenv so that the generated makewrapper contains these settings...

diffstat:

 build.sh |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r d6860c8110a7 -r 1dbc3d5d1eee build.sh
--- a/build.sh  Fri May 09 09:06:14 2003 +0000
+++ b/build.sh  Fri May 09 09:10:06 2003 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.98 2003/05/08 14:19:39 lukem Exp $
+#      $NetBSD: build.sh,v 1.99 2003/05/09 09:10:06 lukem Exp $
 #
 # Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -668,12 +668,13 @@
        statusmsg "TOOLDIR path:    ${TOOLDIR}"
        DESTDIR=$(getmakevar DESTDIR)
        RELEASEDIR=$(getmakevar RELEASEDIR)
-       export TOOLDIR DESTDIR RELEASEDIR
        if ! $do_expertmode; then
                _SRCTOPOBJ_=$(getmakevar _SRC_TOP_OBJ_)
                : ${DESTDIR:=${_SRCTOPOBJ_}/destdir.${MACHINE}}
                : ${RELEASEDIR:=${_SRCTOPOBJ_}/releasedir}
+               makeenv="${makeenv} DESTDIR RELEASEDIR"
        fi
+       export TOOLDIR DESTDIR RELEASEDIR
        statusmsg "DESTDIR path:    ${DESTDIR}"
        statusmsg "RELEASEDIR path: ${RELEASEDIR}"
 
@@ -758,7 +759,7 @@
        eval cat <<EOF ${makewrapout}
 #! /bin/sh
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.98 2003/05/08 14:19:39 lukem Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.99 2003/05/09 09:10:06 lukem Exp $
 #
 
 EOF