[src/trunk]: src/etc Introduce and use GZIP_FLAGS variable, to fix a quoting ...

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

details:   https://anonhg.NetBSD.org/src/rev/bcbe3d9f0a41
branches:  trunk
changeset: 331229:bcbe3d9f0a41
user:      apb <apb%NetBSD.org@localhost>
date:      Wed Aug 06 10:37:30 2014 +0000

description:
Introduce and use GZIP_FLAGS variable, to fix a quoting error
in the way we tried to use GZIP="-9 ${GZIP_N_FLAG}".
For consistency, also use GZIP_FLAGS elesehere in this file.

diffstat:

 etc/Makefile |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r ac63f3363764 -r bcbe3d9f0a41 etc/Makefile
--- a/etc/Makefile      Wed Aug 06 10:03:49 2014 +0000
+++ b/etc/Makefile      Wed Aug 06 10:37:30 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.418 2014/08/05 15:43:50 apb Exp $
+#      $NetBSD: Makefile,v 1.419 2014/08/06 10:37:30 apb Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -47,6 +47,8 @@
 MAKESUMS=      MAKE=${MAKE:Q} CKSUM=${CKSUM:Q} ${HOST_SH} ${NETBSDSRCDIR}/distrib/sets/makesums
 DISTRIBVER!=   ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
 
+GZIP_FLAGS= -9 ${GZIP_N_FLAG}
+
 # Flags for creating ISO CDROM image
 # mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools
 # Note: At least mkisofs 2.0 should be used.
@@ -593,7 +595,7 @@
        kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
        kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
        kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
-       pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP="-9 ${GZIP_N_FLAG}" ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+       pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
        cd $${kerndir} && { \
                kernels=; newest=; \
                for kernel in $${kernlist}; do \
@@ -638,8 +640,8 @@
                                knl_gz="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${kernel}-${configfile:C/.*\///}$${s}.gz"; \
                                [ $${knl_gz} -nt $${ks} ] && continue; \
                                rm -f $${knl_gz}; \
-                               echo "${TOOL_GZIP_N} -c -9 < $${kerndir}/$${ks} > $${knl_gz}"; \
-                               ${TOOL_GZIP_N} -c -9 < $${ks} > $${knl_gz}; \
+                               echo "${TOOL_GZIP} ${GZIP_FLAGS} -c < $${kerndir}/$${ks} > $${knl_gz}"; \
+                               ${TOOL_GZIP} ${GZIP_FLAGS} -c < $${ks} > $${knl_gz}; \
                        done; \
                done; \
        }