[src/netbsd-3]: src Pull up revision 1.136 (requested by lukem in ticket #564):

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

details:   https://anonhg.NetBSD.org/src/rev/e936423a1ee3
branches:  netbsd-3
changeset: 576509:e936423a1ee3
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Jul 07 22:08:49 2005 +0000

description:
Pull up revision 1.136 (requested by lukem in ticket #564):
Unset INFODIR in the makewrapper.
Should fix a build problem observed when installing .info files
when the build user's environment has INFODIR set.

diffstat:

 build.sh |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 00ecd32157ac -r e936423a1ee3 build.sh
--- a/build.sh  Wed Jul 06 22:07:52 2005 +0000
+++ b/build.sh  Thu Jul 07 22:08:49 2005 +0000
@@ -1,7 +1,7 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.134 2004/10/13 23:28:34 gavan Exp $
+#      $NetBSD: build.sh,v 1.134.2.1 2005/07/07 22:08:49 tron Exp $
 #
-# Copyright (c) 2001-2004 The NetBSD Foundation, Inc.
+# Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -139,6 +139,12 @@
        # Set source directories
        #
        setmakeenv NETBSDSRCDIR "${TOP}"
+
+       # Set various environment variables to known defaults,
+       # to minimize (cross-)build problems observed "in the field".
+       #
+       unsetmakeenv INFODIR
+       setmakeenv LC_ALL C
 }
 
 getarch()
@@ -659,7 +665,6 @@
 
        # Set up default make(1) environment.
        #
-       setmakeenv LC_ALL C
        makeenv="${makeenv} TOOLDIR MACHINE MACHINE_ARCH MAKEFLAGS"
        [ -z "${BUILDID}" ] || makeenv="${makeenv} BUILDID"
        MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}"
@@ -861,7 +866,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.134 2004/10/13 23:28:34 gavan Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.134.2.1 2005/07/07 22:08:49 tron Exp $
 # with these arguments: ${_args}
 #
 EOF