From 704bdea4cac334743956c2134a64d19a61e21d34 Mon Sep 17 00:00:00 2001
From: simonb <simonb@NetBSD.org>
Date: Mon, 29 May 2006 16:47:07 +0000
Subject: [PATCH] Use "GZIPPROG" instead of "GZIP", as gzip(1) uses the GZIP
 environment variable to store options.

---
 regress/usr.bin/gzip/Makefile.inc          | 4 ++--
 regress/usr.bin/gzip/concatenated/Makefile | 7 ++++---
 regress/usr.bin/gzip/pipe/Makefile         | 6 +++---
 regress/usr.bin/gzip/test/Makefile         | 6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/regress/usr.bin/gzip/Makefile.inc b/regress/usr.bin/gzip/Makefile.inc
index 2afa350e85bb..169e13124439 100644
--- a/regress/usr.bin/gzip/Makefile.inc
+++ b/regress/usr.bin/gzip/Makefile.inc
@@ -1,3 +1,3 @@
-#	$NetBSD: Makefile.inc,v 1.2 2004/12/01 12:35:02 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2006/05/29 16:47:07 simonb Exp $
 
-GZIP?=		gzip
+GZIPPROG?=	gzip
diff --git a/regress/usr.bin/gzip/concatenated/Makefile b/regress/usr.bin/gzip/concatenated/Makefile
index 98b93810fab3..edf44959f2ae 100644
--- a/regress/usr.bin/gzip/concatenated/Makefile
+++ b/regress/usr.bin/gzip/concatenated/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2005/01/20 20:40:00 erh Exp $
+#	$NetBSD: Makefile,v 1.3 2006/05/29 16:47:07 simonb Exp $
 
 NOMAN=  	# defined
 
@@ -8,10 +8,11 @@ CLEANFILES=	ab1 ab2 bc1 bc2
 
 regress:
 	@echo -n aaaabbbb > ab1
-	@(echo -n aaaa | ${GZIP} ; echo -n bbbb | ${GZIP}) | ${GZIP} -d > ab2
+	@(echo -n aaaa | ${GZIPPROG} ; echo -n bbbb | ${GZIPPROG}) | \
+	    ${GZIPPROG} -d > ab2
 	@cmp ab1 ab2
 	@echo -n bbbb > bc1
-	@(true | ${GZIP} ; cat bc1 | ${GZIP}) | ${GZIP} -d > bc2
+	@(true | ${GZIPPROG} ; cat bc1 | ${GZIPPROG}) | ${GZIPPROG} -d > bc2
 	@cmp bc1 bc2
 
 .include <bsd.prog.mk>
diff --git a/regress/usr.bin/gzip/pipe/Makefile b/regress/usr.bin/gzip/pipe/Makefile
index af4535a7ed39..89007f0dc5ba 100644
--- a/regress/usr.bin/gzip/pipe/Makefile
+++ b/regress/usr.bin/gzip/pipe/Makefile
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2005/02/21 20:08:18 yamt Exp $
+#	$NetBSD: Makefile,v 1.2 2006/05/29 16:47:07 simonb Exp $
 
 NOMAN=  	# defined
 
 .include <bsd.own.mk>
 
 regress:
-	dd if=/dev/zero count=102400 2> /dev/null | ${GZIP} -c | \
-	dd bs=1 2> /dev/null | ${GZIP} -tc
+	dd if=/dev/zero count=102400 2> /dev/null | ${GZIPPROG} -c | \
+	dd bs=1 2> /dev/null | ${GZIPPROG} -tc
 
 .include <bsd.prog.mk>
diff --git a/regress/usr.bin/gzip/test/Makefile b/regress/usr.bin/gzip/test/Makefile
index ebae0603c283..cfacb4b920ac 100644
--- a/regress/usr.bin/gzip/test/Makefile
+++ b/regress/usr.bin/gzip/test/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2004/07/11 09:21:50 yamt Exp $
+#	$NetBSD: Makefile,v 1.3 2006/05/29 16:47:07 simonb Exp $
 
 NOMAN=  	# defined
 
@@ -10,11 +10,11 @@ UUDECODE_FILES=	${BADINPUTS} ${GOODINPUTS}
 
 regress: ${BADINPUTS} ${GOODINPUTS}
 .for x in ${BADINPUTS}
-	@sh -c "if ${GZIP} -t ${x}; then false; else true; fi"
+	@sh -c "if ${GZIPPROG} -t ${x}; then false; else true; fi"
 	@echo "# Errors messages above are expected."
 .endfor
 .for x in ${GOODINPUTS}
-	@${GZIP} -t ${x}
+	@${GZIPPROG} -t ${x}
 .endfor
 
 .include <bsd.prog.mk>