summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/alpha/bsd.rd/Makefile6
-rw-r--r--distrib/alpha/common/Makefile.inc6
-rw-r--r--distrib/hp300/ramdisk/Makefile6
-rw-r--r--distrib/hppa/ramdisk/Makefile6
-rw-r--r--distrib/ramdisk/Makefile4
-rw-r--r--distrib/sparc/ramdisk/Makefile.inc4
-rw-r--r--distrib/sparc64/bsd.rd/Makefile6
-rw-r--r--distrib/sparc64/ramdisk/Makefile10
-rw-r--r--distrib/sparc64/ramdiskB/Makefile10
-rw-r--r--distrib/vax/ramdisk/Makefile.inc4
-rw-r--r--etc/Makefile8
11 files changed, 35 insertions, 35 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index e6b8bcf14ee..34261cfe16b 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2002/06/09 05:53:53 todd Exp $
+# $OpenBSD: Makefile,v 1.8 2007/02/16 16:56:22 tsi Exp $
TOP= ${.CURDIR}/..
@@ -15,7 +15,7 @@ PID!= echo $$$$
REALIMAGE!= echo /var/tmp/image.${PID}
STRIP?= strip
-GZIP?= gzip
+GZIPCMD?= gzip
GZIPFLAGS?= -9f
INSTALLBOOT?= /usr/mdec/installboot -v
@@ -42,7 +42,7 @@ NEWFSARGS_FD= -i 524288 -c 80
bsd.rd: bsd.rd_unz
objcopy -Sg -R .comment bsd.rd_unz bsd.strip
${STRIP} bsd.strip
- ${GZIP} -c ${GZIPFLAGS} bsd.strip > bsd.rd
+ ${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.rd
bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT}
cp bsd bsd.rd_unz
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 4210ad64b65..42022b7ce98 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2005/08/29 03:28:51 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2007/02/16 16:56:22 tsi Exp $
TOP= ${.CURDIR}/..
@@ -15,7 +15,7 @@ PID!= echo $$$$
REALIMAGE!= echo /var/tmp/image.${PID}
STRIP?= strip
-GZIP?= gzip
+GZIPCMD?= gzip
GZIPFLAGS?= -9f
INSTALLBOOT?= /usr/mdec/installboot -v
@@ -66,7 +66,7 @@ ${FLOPPY}: bsd.gz
bsd.gz: bsd.rd
objcopy -Sg -R .comment bsd.rd bsd.strip
${STRIP} bsd.strip
- ${GZIP} -c ${GZIPFLAGS} bsd.strip > bsd.gz
+ ${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.gz
bsd.rd: bsd ${IMAGE} ${RDSETROOT}
cp bsd bsd.rd
diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile
index 2c4d467ccda..45e424f8bbf 100644
--- a/distrib/hp300/ramdisk/Makefile
+++ b/distrib/hp300/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2006/02/15 22:00:59 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.21 2007/02/16 16:56:22 tsi Exp $
# $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $
TOP= ${.CURDIR}/..
@@ -17,13 +17,13 @@ VND_CRDEV= /dev/r${VND}c
PID!= echo $$$$
REALIMAGE!= echo /var/tmp/image.${PID}
-GZIP?= gzip
+GZIPCMD?= gzip
GZIPFLAGS?= -9f
all: ${CBIN} ${IMAGE} bsd.rd
install: bsd.rd
- ${GZIP} -c ${GZIPFLAGS} bsd.rd > ${DESTDIR}/snapshot/bsd.rd
+ ${GZIPCMD} -c ${GZIPFLAGS} bsd.rd > ${DESTDIR}/snapshot/bsd.rd
.include "Makefile.inc"
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index e000b977037..91e11cb2719 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2005/03/25 22:03:10 mickey Exp $
+# $OpenBSD: Makefile,v 1.8 2007/02/16 16:56:22 tsi Exp $
CBIN= instbin
ARCHDIR= ${.CURDIR}/..
@@ -35,7 +35,7 @@ BOOT?= ${DESTDIR}/usr/mdec/boot
CDBOOT?= ${DESTDIR}/usr/mdec/cdboot
STRIP?= strip
-GZIP?= gzip
+GZIPCMD?= gzip
GZIPFLAGS?= -9
# old format, minfree, opt, b/i trks, sects, cpg
@@ -74,7 +74,7 @@ bsd.rd: obsd ${IMAGE} ${RDSETROOT}
@${STRIP} bsd.rd
bsd: bsd.rd
- ${GZIP} ${GZIPFLAGS} < bsd.rd > bsd
+ ${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd
${RDSETROOT}: ${.CURDIR}/../../common/${RDSETROOT}.c
${HOSTCC} ${HOSTCCFLAGS} -o ${RDSETROOT} $<
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 6d80d5aaca3..1fca97a8271 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2006/12/25 01:25:39 deraadt Exp $
+# $OpenBSD: Makefile,v 1.28 2007/02/16 16:56:22 tsi Exp $
REV= ${OSrev}
@@ -95,7 +95,7 @@ bsd.rd: bsd ${IMAGE} ${RDSETROOT}
${STRIP} bsd.rd
bsd.gz: bsd.rd
- ${GZIP} ${GZIPFLAGS} < bsd.rd > bsd.gz
+ ${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd.gz
${RDSETROOT}: ${.CURDIR}/../common/${RDSETROOT}.c
${HOSTCC} ${HOSTCCFLAGS} -o ${RDSETROOT} ${.CURDIR}/../common/${RDSETROOT}.c
diff --git a/distrib/sparc/ramdisk/Makefile.inc b/distrib/sparc/ramdisk/Makefile.inc
index 162881ea079..58e681d9a66 100644
--- a/distrib/sparc/ramdisk/Makefile.inc
+++ b/distrib/sparc/ramdisk/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.14 2002/05/01 19:21:28 mickey Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2007/02/16 16:56:22 tsi Exp $
IMAGESIZE?= 4352
-GZIP?= gzip
+GZIPCMD?= gzip
GZIPFLAGS?= -9v
GZIPEXT?= .gz
MAKEFLOPPY= 1
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 1c61e3e2d24..e5b8b022fea 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2002/06/09 05:53:55 todd Exp $
+# $OpenBSD: Makefile,v 1.12 2007/02/16 16:56:22 tsi Exp $
TOP= ${.CURDIR}/..
@@ -18,7 +18,7 @@ PID!= echo $$$$
REALIMAGE!= echo /var/tmp/image.${PID}
STRIP?= strip
-GZIP?= gzip
+GZIPCMD?= gzip
GZIPFLAGS?= -9f
INSTALLBOOT?= /usr/mdec/installboot -v
MTREE= ${UTILS}/mtree.conf
@@ -46,7 +46,7 @@ NEWFSARGS_FD= -i 524288 -c 80
bsd.rd: bsd.rd_unz
objcopy -Sg -R .comment bsd.rd_unz bsd.strip
${STRIP} bsd.strip
- ${GZIP} -c ${GZIPFLAGS} bsd.strip > bsd.rd
+ ${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.rd
bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT}
cp bsd bsd.rd_unz
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index a76693dd03f..ac58f142ae5 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2005/08/06 18:07:17 deraadt Exp $
+# $OpenBSD: Makefile,v 1.15 2007/02/16 16:56:22 tsi Exp $
TOP= ${.CURDIR}/..
@@ -23,9 +23,9 @@ VND_RDEV= /dev/r${VND}a
VND_CRDEV= /dev/r${VND}c
PID!= echo $$$$
-GZIP?= gzip
-GZIPFLAGS?= -9v
-GZIPEXT?= .gz
+GZIPCMD?= gzip
+GZIPFLAGS?= -9v
+GZIPEXT?= .gz
MOUNT_POINT?= /mnt
DISKTYPE= rdroot
@@ -54,7 +54,7 @@ all ${IMAGE}:
all: ${FLOPPY} ${BSD_RD}
bsd.gz: bsd.rd
- ${GZIP} ${GZIPFLAGS} < bsd.rd > bsd.gz
+ ${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd.gz
${FLOPPY}: bsd.gz ${BOOT} /usr/
dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 535a793819a..4df56f49595 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2005/08/06 18:07:17 deraadt Exp $
+# $OpenBSD: Makefile,v 1.9 2007/02/16 16:56:22 tsi Exp $
TOP= ${.CURDIR}/..
@@ -23,9 +23,9 @@ VND_RDEV= /dev/r${VND}a
VND_CRDEV= /dev/r${VND}c
PID!= echo $$$$
-GZIP?= gzip
-GZIPFLAGS?= -9v
-GZIPEXT?= .gz
+GZIPCMD?= gzip
+GZIPFLAGS?= -9v
+GZIPEXT?= .gz
MOUNT_POINT?= /mnt
DISKTYPE= rdroot
@@ -54,7 +54,7 @@ all ${IMAGE}:
all: ${FLOPPY} ${BSD_RD}
bsd.gz: bsd.rd
- ${GZIP} ${GZIPFLAGS} < bsd.rd > bsd.gz
+ ${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd.gz
${FLOPPY}: bsd.gz ${BOOT} /usr/
dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
diff --git a/distrib/vax/ramdisk/Makefile.inc b/distrib/vax/ramdisk/Makefile.inc
index 0ed85191bdc..037981c9155 100644
--- a/distrib/vax/ramdisk/Makefile.inc
+++ b/distrib/vax/ramdisk/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.3 2002/04/05 03:10:04 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2007/02/16 16:56:22 tsi Exp $
IMAGESIZE= 3072
-GZIP?= gzip
+GZIPCMD?= gzip
GZIPFLAGS?= -9v
GZIPEXT?= .gz
MAKEFLOPPY= 1
diff --git a/etc/Makefile b/etc/Makefile
index 03c99a8d25b..1069bbab116 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.246 2007/01/31 08:32:16 pyr Exp $
+# $OpenBSD: Makefile,v 1.247 2007/02/16 16:56:22 tsi Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@@ -35,11 +35,11 @@ PCS= pcs750.bin
# (pmax or slower :-)). This way you get only tar'ed snap files and you can
# gzip them on a faster machine
.ifndef NOGZIP
-GZIP?= gzip
+GZIPCMD?= gzip
GZIPFLAGS?= -9
GZIPEXT?= .gz
.else
-GZIP= cat
+GZIPCMD= cat
GZIPFLAGS=
GZIPEXT=
.endif
@@ -340,7 +340,7 @@ distrib:
DHSIZE=1024 1536 2048 3072 4096
update-moduli:
( \
- echo '# $$OpenBSD: Makefile,v 1.246 2007/01/31 08:32:16 pyr Exp $$'; \
+ echo '# $$OpenBSD: Makefile,v 1.247 2007/02/16 16:56:22 tsi Exp $$'; \
echo '# Time Type Tests Tries Size Generator Modulus'; \
( for i in ${DHSIZE}; do \
ssh-keygen -b $$i -G /dev/stdout; \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 05:44:09 +0000