Module Name: src
Committed By: apb
Date: Mon Jan 27 08:18:08 UTC 2014
Modified Files:
src/distrib/alpha/floppy-GENERIC: Makefile
src/distrib/alpha/rz25dist: Makefile
src/distrib/cobalt: Makefile
src/distrib/common: Makefile.image Makefile.mdset Makefile.minirootkmod
Makefile.tarfloppy
src/distrib/evbarm/gzboot/gzimg: Makefile
src/distrib/ews4800mips/floppies/instkernel: Makefile
src/distrib/prep/floppies/bootfloppy-common: Makefile.inc
src/distrib/prep/floppies/kernel-generic: Makefile
src/distrib/rs6000/bootfs: Makefile
src/distrib/sets: Makefile
src/distrib/sparc64/xminiroot: Makefile
src/distrib/x68k/floppies/bootfloppy.generic: Makefile
src/etc/etc.cats: Makefile.inc
src/external/mit/xorg/share/fonts: Makefile.bdf
src/external/mit/xorg/share/fonts/encodings: Makefile.enc
src/lib/libc/time: Makefile
src/libexec/httpd: Makefile
src/sys/arch/evbppc/conf: Makefile.obs405.inc
src/x11/share/fonts/bdf: Makefile.bdf
src/x11/share/fonts/encodings: Makefile.enc
Log Message:
Use ${TOOL_GZIP} instead of just gzip in all Makefiles
outside */dist/* subdirectories.
When USE_PIGZGZIP=yes, bsd.own.mk sets TOOL_GZIP=${TOOL_PIGZ},
so there's no need to test USE_PIGZGZIP in these Makefiles.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/alpha/floppy-GENERIC/Makefile
cvs rdiff -u -r1.29 -r1.30 src/distrib/alpha/rz25dist/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/cobalt/Makefile
cvs rdiff -u -r1.32 -r1.33 src/distrib/common/Makefile.image
cvs rdiff -u -r1.38 -r1.39 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.1 -r1.2 src/distrib/common/Makefile.minirootkmod
cvs rdiff -u -r1.16 -r1.17 src/distrib/common/Makefile.tarfloppy
cvs rdiff -u -r1.24 -r1.25 src/distrib/evbarm/gzboot/gzimg/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/ews4800mips/floppies/instkernel/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/distrib/prep/floppies/bootfloppy-common/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/distrib/prep/floppies/kernel-generic/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/rs6000/bootfs/Makefile
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/Makefile
cvs rdiff -u -r1.29 -r1.30 src/distrib/sparc64/xminiroot/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/distrib/x68k/floppies/bootfloppy.generic/Makefile
cvs rdiff -u -r1.16 -r1.17 src/etc/etc.cats/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/share/fonts/Makefile.bdf
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/share/fonts/encodings/Makefile.enc
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/time/Makefile
cvs rdiff -u -r1.17 -r1.18 src/libexec/httpd/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.7 -r1.8 src/x11/share/fonts/bdf/Makefile.bdf
cvs rdiff -u -r1.8 -r1.9 src/x11/share/fonts/encodings/Makefile.enc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/floppy-GENERIC/Makefile
diff -u src/distrib/alpha/floppy-GENERIC/Makefile:1.20 src/distrib/alpha/floppy-GENERIC/Makefile:1.21
--- src/distrib/alpha/floppy-GENERIC/Makefile:1.20 Fri Apr 3 22:36:34 2009
+++ src/distrib/alpha/floppy-GENERIC/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/04/03 22:36:34 perry Exp $
+# $NetBSD: Makefile,v 1.21 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -42,7 +42,7 @@ netbsd: ${FLOPPYKERNEL}
@rm -f ${.TARGET} ${.TARGET}.tmp
cp ${.ALLSRC} ${.TARGET}.tmp
${STRIP} ${.TARGET}.tmp
- gzip -9nf ${.TARGET}.tmp
+ ${TOOL_GZIP} -9nf ${.TARGET}.tmp
mv ${.TARGET}.tmp.gz ${.TARGET}
CLEANFILES+= netbsd netbsd.tmp netbsd.tmp.gz
Index: src/distrib/alpha/rz25dist/Makefile
diff -u src/distrib/alpha/rz25dist/Makefile:1.29 src/distrib/alpha/rz25dist/Makefile:1.30
--- src/distrib/alpha/rz25dist/Makefile:1.29 Fri Apr 3 22:36:34 2009
+++ src/distrib/alpha/rz25dist/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/04/03 22:36:34 perry Exp $
+# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $
.include "../../../Makefile.inc"
@@ -77,21 +77,21 @@ diskimage.gz: mount-fs build-fs unmount-
umount ${DESTDIR}/usr ${DESTDIR}
/bin/rm -f $@
dd if=/dev/r${DESTDISK}c bs=`expr ${SECPERCYL} \* 512` \
- count=${CYLS} | gzip -9n > $@
+ count=${CYLS} | ${TOOL_GZIP} -9n > $@
bin.tar.gz: mount-fs build-fs
/bin/rm -f $@
(cd ${DESTDIR} ; find . | grep -v '^./etc' | \
grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \
- grep -v '^./boot' | pax -w -d | gzip -9n) > $@
+ grep -v '^./boot' | pax -w -d | ${TOOL_GZIP} -9n) > $@
etc.tar.gz: mount-fs build-fs
/bin/rm -f $@
- (cd ${DESTDIR} ; find ./etc | pax -w -d | gzip -9n) > $@
+ (cd ${DESTDIR} ; find ./etc | pax -w -d | ${TOOL_GZIP} -9n) > $@
x11.tar.gz: mount-fs build-fs
/bin/rm -f $@
- (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | gzip -9n) > $@
+ (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP} -9n) > $@
.endif
Index: src/distrib/cobalt/Makefile
diff -u src/distrib/cobalt/Makefile:1.3 src/distrib/cobalt/Makefile:1.4
--- src/distrib/cobalt/Makefile:1.3 Fri Apr 3 22:36:34 2009
+++ src/distrib/cobalt/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/03 22:36:34 perry Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,7 +9,8 @@ SUBDIR= ramdisk .WAIT instkernel .WAIT
TARGETS+= release
release: check_RELEASEDIR .WAIT ${BOOT}
- gzip -9nc ${BOOT} > ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot.gz
+ ${TOOL_GZIP} -9nc ${BOOT} \
+ > ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot.gz
iso_image:
${MAKEDIRTARGET} cdroms iso_image
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.32 src/distrib/common/Makefile.image:1.33
--- src/distrib/common/Makefile.image:1.32 Fri May 24 21:34:19 2013
+++ src/distrib/common/Makefile.image Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.32 2013/05/24 21:34:19 christos Exp $
+# $NetBSD: Makefile.image,v 1.33 2014/01/27 08:18:07 apb Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -103,7 +103,7 @@ fsimage: ${IMAGE}
${IMAGE}.gz: ${IMAGE}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
realall: ${IMAGE}
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.38 src/distrib/common/Makefile.mdset:1.39
--- src/distrib/common/Makefile.mdset:1.38 Thu Aug 15 12:39:28 2013
+++ src/distrib/common/Makefile.mdset Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.38 2013/08/15 12:39:28 joerg Exp $
+# $NetBSD: Makefile.mdset,v 1.39 2014/01/27 08:18:07 apb Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -110,7 +110,7 @@ KERNELS+= ${_KERNEL.${_K}.${_F}}.${_S}.g
${_KERNEL.${_K}.${_F}}.${_S}.gz: ${_KERNEL.${_K}.${_F}}.${_S}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
.endif # }
.endfor # }
@@ -150,7 +150,7 @@ ${_KERNEL.${_K}.${_F}}: .NOTMAIN ${_KERN
${TOOL_MDSETIMAGE} ${MDSETIMAGEFLAGS} ${.TARGET}.tmp ${_I}
.endif
.if !defined(MDSET_NOSYMBOLS.${_FILENAME}) && !defined(MDSET_NOSYMBOLS)
- ${NM} ${.TARGET}.tmp | gzip -9n > ${.TARGET}.symbols.gz
+ ${NM} ${.TARGET}.tmp | ${TOOL_GZIP} -9n > ${.TARGET}.symbols.gz
.endif
.if !defined(MDSET_NOSTRIP.${_FILENAME}) && !defined(MDSET_NOSTRIP)
${STRIP} -R .eh_frame -R .eh_frame_hdr -R .comment -R .ident ${.TARGET}.tmp
@@ -168,7 +168,7 @@ KERNELS+= ${_KERNEL.${_K}.${_F}}.gz
${_KERNEL.${_K}.${_F}}.gz: ${_KERNEL.${_K}.${_F}}
${_MKTARGET_CREATE}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
.endif # }
.endif
Index: src/distrib/common/Makefile.minirootkmod
diff -u src/distrib/common/Makefile.minirootkmod:1.1 src/distrib/common/Makefile.minirootkmod:1.2
--- src/distrib/common/Makefile.minirootkmod:1.1 Tue Oct 16 08:19:36 2012
+++ src/distrib/common/Makefile.minirootkmod Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.minirootkmod,v 1.1 2012/10/16 08:19:36 apb Exp $
+# $NetBSD: Makefile.minirootkmod,v 1.2 2014/01/27 08:18:07 apb Exp $
#
# Makefile snippet to build a miniroot kernel module (e.g. miniroot.kmod)
#
@@ -46,7 +46,7 @@ ${MINIROOT}.kmod: ${RAMDISKFS} ${SRCMOD}
${OBJCOPY} --add-section miniroot=${RAMDISKFS} \
--set-section-flags miniroot=alloc,contents,load,data \
${SRCMOD} ${DSTMOD}.tmp
- gzip -9nc < ${DSTMOD}.tmp > ${DSTMOD}
+ ${TOOL_GZIP} -9nc < ${DSTMOD}.tmp > ${DSTMOD}
rm -f ${DSTMOD}.tmp
.include <bsd.prog.mk>
Index: src/distrib/common/Makefile.tarfloppy
diff -u src/distrib/common/Makefile.tarfloppy:1.16 src/distrib/common/Makefile.tarfloppy:1.17
--- src/distrib/common/Makefile.tarfloppy:1.16 Fri Apr 3 22:36:35 2009
+++ src/distrib/common/Makefile.tarfloppy Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.tarfloppy,v 1.16 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile.tarfloppy,v 1.17 2014/01/27 08:18:07 apb Exp $
#
# Makefile snippet to create a set of ustar floppies.
# Each floppy has an 8KB header, followed by part or all of the ustar archive.
@@ -54,7 +54,8 @@ boot.cfg: ${FLOPPY_BOOT_CFG}
CLEANFILES+= netbsd netbsd.tmp
.if ${FLOPPY_NETBSD:E}=="gz"
COPY_CMD= gunzip -c ${.ALLSRC} > ${.TARGET}.tmp
-COMPRESS_CMD= gzip -9nc ${.TARGET}.tmp > ${.TARGET}; rm -f ${.TARGET}.tmp
+COMPRESS_CMD= ${TOOL_GZIP} -9nc ${.TARGET}.tmp > ${.TARGET}; \
+ rm -f ${.TARGET}.tmp
.else
COPY_CMD= cp ${.ALLSRC} ${.TARGET}.tmp
COMPRESS_CMD= mv -f ${.TARGET}.tmp ${.TARGET}
Index: src/distrib/evbarm/gzboot/gzimg/Makefile
diff -u src/distrib/evbarm/gzboot/gzimg/Makefile:1.24 src/distrib/evbarm/gzboot/gzimg/Makefile:1.25
--- src/distrib/evbarm/gzboot/gzimg/Makefile:1.24 Wed Jan 30 13:47:36 2013
+++ src/distrib/evbarm/gzboot/gzimg/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/01/30 13:47:36 he Exp $
+# $NetBSD: Makefile,v 1.25 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -76,12 +76,12 @@ GZIMGS+= gzimg_${I}_flash_${R}.gz
gzimg_${I}_flash_${R}: .NOTMAIN ${GZB${G}} ${KERNOBJDIR}/${K}/${W}.bin
@echo "Populating ${.TARGET}"
-rm -f ${.TARGET}.kern.gz
- gzip -9nc ${KERNOBJDIR}/${K}/${W}.bin > ${.TARGET}.kern.gz
+ ${TOOL_GZIP} -9nc ${KERNOBJDIR}/${K}/${W}.bin > ${.TARGET}.kern.gz
${TOOL_CAT} ${GZB${G}} ${.TARGET}.kern.gz > ${.TARGET}
gzimg_${I}_flash_${R}.gz: .NOTMAIN gzimg_${I}_flash_${R}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
CLEANFILES+= gzimg_${I}_flash_${R}.kern gzimg_${I}_flash_${R}.kern.gz \
gzimg_${I}_flash_${R}
Index: src/distrib/ews4800mips/floppies/instkernel/Makefile
diff -u src/distrib/ews4800mips/floppies/instkernel/Makefile:1.4 src/distrib/ews4800mips/floppies/instkernel/Makefile:1.5
--- src/distrib/ews4800mips/floppies/instkernel/Makefile:1.4 Fri Apr 3 22:36:35 2009
+++ src/distrib/ews4800mips/floppies/instkernel/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -20,7 +20,7 @@ ${BOOT_RAMDISK}.gz: netbsd-RAMDISK.gz ${
gunzip -c ${DESTDIR}/usr/mdec/boot_kernel.gz > ${BOOT_RAMDISK}.tmp
${TOOL_MDSETIMAGE} ${BOOT_RAMDISK}.tmp netbsd-RAMDISK.gz
${ELF2ECOFF} ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff
- gzip -9nc ${BOOT_RAMDISK}.coff > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${BOOT_RAMDISK}.coff > ${.TARGET}
CLEANFILES+= ${BOOT_RAMDISK}.tmp ${BOOT_RAMDISK}.coff ${BOOT_RAMDISK}.gz
Index: src/distrib/prep/floppies/bootfloppy-common/Makefile.inc
diff -u src/distrib/prep/floppies/bootfloppy-common/Makefile.inc:1.12 src/distrib/prep/floppies/bootfloppy-common/Makefile.inc:1.13
--- src/distrib/prep/floppies/bootfloppy-common/Makefile.inc:1.12 Mon Jun 23 02:16:54 2008
+++ src/distrib/prep/floppies/bootfloppy-common/Makefile.inc Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2008/06/23 02:16:54 matt Exp $
+# $NetBSD: Makefile.inc,v 1.13 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,7 @@ BOOTLOADER?= ${MDEC}/boot_com0
TMPKERNEL= ${.OBJDIR}/netbsd
${IMAGE}: ${KERNEL}
- gzip -cd ${KERNEL} > ${TMPKERNEL}
+ ${TOOL_GZIP} -cd ${KERNEL} > ${TMPKERNEL}
${TOOL_POWERPCMKBOOTIMAGE} -m ${MACHINE} -b ${BOOTLOADER} \
-k ${TMPKERNEL} ${.TARGET}
-rm -f ${TMPKERNEL}
Index: src/distrib/prep/floppies/kernel-generic/Makefile
diff -u src/distrib/prep/floppies/kernel-generic/Makefile:1.9 src/distrib/prep/floppies/kernel-generic/Makefile:1.10
--- src/distrib/prep/floppies/kernel-generic/Makefile:1.9 Fri Apr 3 22:36:35 2009
+++ src/distrib/prep/floppies/kernel-generic/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile,v 1.10 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,7 @@ CLEANFILES+= ${KERNEL}
${KERNEL}: ${KERN}
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
realall: ${KERNEL}
Index: src/distrib/rs6000/bootfs/Makefile
diff -u src/distrib/rs6000/bootfs/Makefile:1.1 src/distrib/rs6000/bootfs/Makefile:1.2
--- src/distrib/rs6000/bootfs/Makefile:1.1 Thu Apr 30 12:47:39 2009
+++ src/distrib/rs6000/bootfs/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/04/30 12:47:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,10 +16,10 @@ TMPKERNEL= ${.OBJDIR}/netbsd
BOOT_RELEASEDIR= installation/bootfs
${IMAGE}.gz: ${KERNEL} ${BOOTLOADER}
- gzip -cd ${KERNEL} > ${TMPKERNEL}
+ ${TOOL_GZIP} -cd ${KERNEL} > ${TMPKERNEL}
${TOOL_POWERPCMKBOOTIMAGE} -m ${MACHINE} \
-b ${BOOTLOADER} -k ${TMPKERNEL} ${IMAGE}
- gzip -9nc ${IMAGE} > ${IMAGE}.tmp
+ ${TOOL_GZIP} -9nc ${IMAGE} > ${IMAGE}.tmp
mv ${IMAGE}.tmp ${.TARGET}
CLEANFILES+= ${IMAGE} ${IMAGE}.tmp ${IMAGE}.gz
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.92 src/distrib/sets/Makefile:1.93
--- src/distrib/sets/Makefile:1.92 Thu Jan 23 21:45:27 2014
+++ src/distrib/sets/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2014/01/23 21:45:27 apb Exp $
+# $NetBSD: Makefile,v 1.93 2014/01/27 08:18:07 apb Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -15,11 +15,7 @@ all:
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-.if ${USE_PIGZGZIP} != "no"
-COMPRESS_PROGRAM=${TOOL_PIGZ:Q}
-.else
-COMPRESS_PROGRAM=gzip
-.endif
+COMPRESS_PROGRAM=${TOOL_GZIP}
SETSENV= DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} \
Index: src/distrib/sparc64/xminiroot/Makefile
diff -u src/distrib/sparc64/xminiroot/Makefile:1.29 src/distrib/sparc64/xminiroot/Makefile:1.30
--- src/distrib/sparc64/xminiroot/Makefile:1.29 Fri Mar 12 23:07:13 2010
+++ src/distrib/sparc64/xminiroot/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2010/03/12 23:07:13 martin Exp $
+# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -23,7 +23,7 @@ ${CRUNCHBIN}: ${CRUNCHBINDIR}/${CRUNCHBI
netbsd.gz: ${KERNOBJDIR}/GENERIC/netbsd
-rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
clean: localclean
Index: src/distrib/x68k/floppies/bootfloppy.generic/Makefile
diff -u src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.7 src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.8
--- src/distrib/x68k/floppies/bootfloppy.generic/Makefile:1.7 Fri Apr 3 22:36:35 2009
+++ src/distrib/x68k/floppies/bootfloppy.generic/Makefile Mon Jan 27 08:18:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/04/03 22:36:35 perry Exp $
+# $NetBSD: Makefile,v 1.8 2014/01/27 08:18:07 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -28,7 +28,7 @@ ${BOOTNAME}: ${MDEC}/boot
netbsd.gz: ${KERNOBJDIR}/GENERIC/netbsd
@rm -f ${.TARGET}
- gzip -9nc ${.ALLSRC} > ${.TARGET}
+ ${TOOL_GZIP} -9nc ${.ALLSRC} > ${.TARGET}
.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
Index: src/etc/etc.cats/Makefile.inc
diff -u src/etc/etc.cats/Makefile.inc:1.16 src/etc/etc.cats/Makefile.inc:1.17
--- src/etc/etc.cats/Makefile.inc:1.16 Tue Mar 18 04:20:37 2008
+++ src/etc/etc.cats/Makefile.inc Mon Jan 27 08:18:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2008/03/18 04:20:37 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.17 2014/01/27 08:18:08 apb Exp $
#
# etc.cats/Makefile.inc -- cats-specific etc Makefile targets
#
@@ -17,5 +17,5 @@ snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/kernel '*.gz'
iso-image-md-pre:
- gzip -dc ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd.aout-INSTALL.gz \
+ ${TOOL_GZIP} -dc ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd.aout-INSTALL.gz \
> ${CDROM.dir}/netbsd
Index: src/external/mit/xorg/share/fonts/Makefile.bdf
diff -u src/external/mit/xorg/share/fonts/Makefile.bdf:1.2 src/external/mit/xorg/share/fonts/Makefile.bdf:1.3
--- src/external/mit/xorg/share/fonts/Makefile.bdf:1.2 Tue Mar 31 21:18:36 2009
+++ src/external/mit/xorg/share/fonts/Makefile.bdf Mon Jan 27 08:18:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bdf,v 1.2 2009/03/31 21:18:36 perry Exp $
+# $NetBSD: Makefile.bdf,v 1.3 2014/01/27 08:18:08 apb Exp $
# Font files built using this makefile are cleaned in two ways:
#
@@ -17,7 +17,7 @@ FILESDIR= ${X11FONTDIR}/${FONTSUBDIR}
.PATH: ${X11SRCDIR.${FONTSRCPKG}}
FONTSUFFIX= .gz
-FONTGZIP= | gzip ${GZIPLEVEL:U-9} -ncf
+FONTGZIP= | ${TOOL_GZIP} ${GZIPLEVEL:U-9} -ncf
.include "${NETBSDSRCDIR}/external/mit/xorg/tools/bdftopcf/Makefile.bdftopcf"
.include "${NETBSDSRCDIR}/external/mit/xorg/tools/ucs2any/Makefile.ucs2any"
Index: src/external/mit/xorg/share/fonts/encodings/Makefile.enc
diff -u src/external/mit/xorg/share/fonts/encodings/Makefile.enc:1.2 src/external/mit/xorg/share/fonts/encodings/Makefile.enc:1.3
--- src/external/mit/xorg/share/fonts/encodings/Makefile.enc:1.2 Tue Mar 31 21:21:48 2009
+++ src/external/mit/xorg/share/fonts/encodings/Makefile.enc Mon Jan 27 08:18:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.enc,v 1.2 2009/03/31 21:21:48 perry Exp $
+# $NetBSD: Makefile.enc,v 1.3 2014/01/27 08:18:08 apb Exp $
FILESDIR= ${X11FONTDIR}/${ENCDIR}
@@ -9,7 +9,7 @@ CLEANFILES+= ${GZFILES:S/.gz$/.gz.tmp/}
.SUFFIXES: .enc .enc.gz
.enc.enc.gz:
${_MKTARGET_CREATE}
- gzip -9nfc ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+ ${TOOL_GZIP} -9nfc ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
realall: ${FILES}
Index: src/lib/libc/time/Makefile
diff -u src/lib/libc/time/Makefile:1.16 src/lib/libc/time/Makefile:1.17
--- src/lib/libc/time/Makefile:1.16 Thu Dec 26 18:34:28 2013
+++ src/lib/libc/time/Makefile Mon Jan 27 08:18:08 2014
@@ -548,12 +548,12 @@ tzcode$(VERSION).tar.gz: set-timestamps.
LC_ALL=C && export LC_ALL && \
tar $(TARFLAGS) -cf - \
$(COMMON) $(DOCS) $(SOURCES) $(MISC) | \
- gzip $(GZIPFLAGS) > $@
+ ${TOOL_GZIP} $(GZIPFLAGS) > $@
tzdata$(VERSION).tar.gz: set-timestamps.out
LC_ALL=C && export LC_ALL && \
tar $(TARFLAGS) -cf - $(COMMON) $(DATA) | \
- gzip $(GZIPFLAGS) > $@
+ ${TOOL_GZIP} $(GZIPFLAGS) > $@
signatures: tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc
Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.17 src/libexec/httpd/Makefile:1.18
--- src/libexec/httpd/Makefile:1.17 Wed Oct 16 10:04:26 2013
+++ src/libexec/httpd/Makefile Mon Jan 27 08:18:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/10/16 10:04:26 he Exp $
+# $NetBSD: Makefile,v 1.18 2014/01/27 08:18:08 apb Exp $
#
# $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
#
@@ -83,7 +83,7 @@ export-distfile:
find . -name .CVS | xargs rm -r; \
); \
pax -wf ${TAR} ${BASE}; \
- gzip -c9 ${TAR} > ${TAR}.gz; \
+ ${TOOL_GZIP} -c9 ${TAR} > ${TAR}.gz; \
bzip2 -9 ${TAR}
@echo "Exported two files:"
@echo ${TAR}.gz
Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.7 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.8
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.7 Wed Mar 20 06:35:49 2013
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc Mon Jan 27 08:18:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.obs405.inc,v 1.7 2013/03/20 06:35:49 kiyohara Exp $
+# $NetBSD: Makefile.obs405.inc,v 1.8 2014/01/27 08:18:08 apb Exp $
CFLAGS+=-mcpu=405
AFLAGS+=-mcpu=405
@@ -55,8 +55,8 @@ MKUBOOTIMAGEARGS_GZ= ${MKUBOOTIMAGEAR
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ [email protected]; \
${OBJCOPY} -S -O binary $@ [email protected]; \
- echo "gzip -c [email protected] > [email protected]"; \
- gzip -c [email protected] > [email protected]; \
+ echo "${TOOL_GZIP} -c [email protected] > [email protected]"; \
+ ${TOOL_GZIP} -c [email protected] > [email protected]; \
echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} [email protected] [email protected]; \
${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} [email protected] [email protected]; \
echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} [email protected] [email protected]; \
Index: src/x11/share/fonts/bdf/Makefile.bdf
diff -u src/x11/share/fonts/bdf/Makefile.bdf:1.7 src/x11/share/fonts/bdf/Makefile.bdf:1.8
--- src/x11/share/fonts/bdf/Makefile.bdf:1.7 Tue Mar 31 21:12:51 2009
+++ src/x11/share/fonts/bdf/Makefile.bdf Mon Jan 27 08:18:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bdf,v 1.7 2009/03/31 21:12:51 perry Exp $
+# $NetBSD: Makefile.bdf,v 1.8 2014/01/27 08:18:08 apb Exp $
# Font files built using this makefile are cleaned in two ways:
#
@@ -17,7 +17,7 @@ FILESDIR= ${X11FONTDIR}/${FONTSUBDIR}
.PATH: ${X11SRCDIR.xc}/fonts/bdf/${FONTSUBDIR}
FONTSUFFIX= .gz
-FONTGZIP= | gzip ${GZIPLEVEL:U-9} -ncf
+FONTGZIP= | ${TOOL_GZIP} ${GZIPLEVEL:U-9} -ncf
.include "${NETBSDSRCDIR}/x11/tools/bdftopcf/Makefile.bdftopcf"
.include "${NETBSDSRCDIR}/x11/tools/ucs2any/Makefile.ucs2any"
Index: src/x11/share/fonts/encodings/Makefile.enc
diff -u src/x11/share/fonts/encodings/Makefile.enc:1.8 src/x11/share/fonts/encodings/Makefile.enc:1.9
--- src/x11/share/fonts/encodings/Makefile.enc:1.8 Tue Mar 31 21:12:51 2009
+++ src/x11/share/fonts/encodings/Makefile.enc Mon Jan 27 08:18:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.enc,v 1.8 2009/03/31 21:12:51 perry Exp $
+# $NetBSD: Makefile.enc,v 1.9 2014/01/27 08:18:08 apb Exp $
FILESDIR= ${X11FONTDIR}/${ENCDIR}
.PATH: ${X11SRCDIR.xc}/fonts/${ENCDIR}
@@ -11,7 +11,8 @@ CLEANFILES+= ${GZFILES:S/.gz$/.gz.tmp/}
.SUFFIXES: .enc .enc.gz
.enc.enc.gz:
${_MKTARGET_CREATE}
- gzip -9nfc ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+ ${TOOL_GZIP} -9nfc ${.IMPSRC} > ${.TARGET}.tmp \
+ && mv ${.TARGET}.tmp ${.TARGET}
realall: ${FILES}
