From 3d02b6c8c78142bf18b6d6099b3e4e4a299c9827 Mon Sep 17 00:00:00 2001
From: martti <martti@pkgsrc.org>
Date: Tue, 4 Dec 2001 12:34:37 +0000
Subject: Set environment variables in one place before executing "make
 distribution".

---
 sysutils/etcupdate/Makefile        |  4 ++--
 sysutils/etcupdate/files/etcupdate | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'sysutils/etcupdate')

diff --git a/sysutils/etcupdate/Makefile b/sysutils/etcupdate/Makefile
index 80b36b2c27f..6f1a9866b16 100644
--- a/sysutils/etcupdate/Makefile
+++ b/sysutils/etcupdate/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2001/12/01 11:42:09 martti Exp $
+# $NetBSD: Makefile,v 1.8 2001/12/04 12:34:37 martti Exp $
 
-DISTNAME=	etcupdate-20011201
+DISTNAME=	etcupdate-20011204
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/sysutils/etcupdate/files/etcupdate b/sysutils/etcupdate/files/etcupdate
index b9b2eac4019..63385de63a3 100755
--- a/sysutils/etcupdate/files/etcupdate
+++ b/sysutils/etcupdate/files/etcupdate
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: etcupdate,v 1.8 2001/12/01 11:42:09 martti Exp $
+# $NetBSD: etcupdate,v 1.9 2001/12/04 12:34:38 martti Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -357,17 +357,21 @@ if [ -z "${CONTINUE}" ]; then
 			echo "*** ERROR: Unable to find ${SRCDIR}/Makefile"
 			exit 1
 		fi
+		# Set the environment for make
+		MAKE_ENV=" 			\
+			DESTDIR=${TEMPROOT}	\
+			MAKE=make		\
+			MTREE=mtree		\
+			INSTALL_DONE=1		\
+			NO_SENDMAIL=1"
 		echo "*** Populating ${TEMPROOT} from ${SRCDIR}"
 		cd ${SRCDIR}
 		if [ -z "${VERBOSE}" ]; then
-			make DESTDIR="${TEMPROOT}" MTREE="mtree"	\
-				INSTALL_DONE=1 NO_SENDMAIL=1		\
-				distribution > /dev/null
+			eval ${MAKE_ENV} make distribution > /dev/null
 		else
-			make DESTDIR="${TEMPROOT}" MTREE="mtree"	\
-				INSTALL_DONE=1 NO_SENDMAIL=1		\
-				distribution
+			eval ${MAKE_ENV} make distribution
 		fi
+		[ $? -ne 0 ] && exit 1
 	elif [ ! -f "${TEMPROOT}/dev/MAKEDEV" ]; then
 		echo ""
 		echo "*** WARNING: ${TEMPROOT}/dev/MAKEDEV not found"
-- 
cgit v1.2.3