[src/trunk]: src Now that MKUPDATE and MKUNPRIVED are "normalized" with getma...

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

details:   https://anonhg.NetBSD.org/src/rev/647a80dd7188
branches:  trunk
changeset: 555247:647a80dd7188
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Nov 12 15:51:45 2003 +0000

description:
Now that MKUPDATE and MKUNPRIVED are "normalized" with getmakevar(),
test with  "${MKxxx}" = "no"  instead of  -z "${MKxxx}"

Ignore errors when running pwd -P.  (GNU coreutils incorrectly complains)


Both problems pointed out in private email from Christian Limpach.

diffstat:

 build.sh |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r ef390440bd8e -r 647a80dd7188 build.sh
--- a/build.sh  Wed Nov 12 15:25:19 2003 +0000
+++ b/build.sh  Wed Nov 12 15:51:45 2003 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.123 2003/10/31 01:46:39 lukem Exp $
+#      $NetBSD: build.sh,v 1.124 2003/11/12 15:51:45 lukem Exp $
 #
 # Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -87,7 +87,7 @@
        # XXX Except that doesn't work on Solaris.
        #
        unset PWD
-       TOP=$(/bin/pwd -P)
+       TOP=$(/bin/pwd -P 2>/dev/null)
 
        # Set defaults.
        #
@@ -774,7 +774,7 @@
        if ${do_build} || ${do_distribution} || ${do_release}; then
                if ! ${do_expertmode} && \
                    [ $(id -u 2>/dev/null) -ne 0 ] && \
-                   [ -z "${MKUNPRIVED}" ] ; then
+                   [ "${MKUNPRIVED}" = "no" ] ; then
                        bomb "-U or -E must be set for build as an unprivileged user."
                fi
         fi
@@ -829,7 +829,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.123 2003/10/31 01:46:39 lukem Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.124 2003/11/12 15:51:45 lukem Exp $
 #
 
 EOF
@@ -859,7 +859,7 @@
                    bomb "Failed to make obj-tools"
        fi
        ${runcmd} cd tools
-       if [ -z "${MKUPDATE}" ]; then
+       if [ "${MKUPDATE}" = "no" ]; then
                cleandir=cleandir
        else
                cleandir=
@@ -917,7 +917,7 @@
        statusmsg "Build directory:  ${kernelbuildpath}"
        ${runcmd} mkdir -p "${kernelbuildpath}" ||
            bomb "Cannot mkdir: ${kernelbuildpath}"
-       if [ -z "${MKUPDATE}" ]; then
+       if [ "${MKUPDATE}" = "no" ]; then
                ${runcmd} cd "${kernelbuildpath}"
                ${runcmd} "${makewrapper}" cleandir ||
                    bomb "Failed to make cleandir in ${kernelbuildpath}"