Module Name: src
Committed By: martin
Date: Mon Oct 1 09:47:34 UTC 2018
Modified Files:
src/distrib/sets: Makefile
src/etc: Makefile
Log Message:
Redo xz vs. gzip selection via conditional make expressions, suggested
by joerg.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/Makefile
cvs rdiff -u -r1.436 -r1.437 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.105 src/distrib/sets/Makefile:1.106
--- src/distrib/sets/Makefile:1.105 Sat Sep 29 06:36:29 2018
+++ src/distrib/sets/Makefile Mon Oct 1 09:47:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2018/09/29 06:36:29 kre Exp $
+# $NetBSD: Makefile,v 1.106 2018/10/01 09:47:34 martin Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -15,15 +15,10 @@ all:
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-.if defined(USE_XZ_SETS) && ${USE_XZ_SETS} != "no"
-COMPRESS_PROGRAM=${TOOL_XZ}
-XZ_OPT=-9
-TAR_SUFF=tar.xz
-.else
-COMPRESS_PROGRAM=${TOOL_GZIP}
-GZIP_FLAGS= ${GZIP_N_FLAG}
-TAR_SUFF=tgz
-.endif
+COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
+TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
+XZ_OPT= -9
+GZIP_FLAGS= ${GZIP_N_FLAG}
SETSENV= DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} \
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.436 src/etc/Makefile:1.437
--- src/etc/Makefile:1.436 Sat Sep 29 06:10:01 2018
+++ src/etc/Makefile Mon Oct 1 09:47:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.436 2018/09/29 06:10:01 martin Exp $
+# $NetBSD: Makefile,v 1.437 2018/10/01 09:47:34 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -410,14 +410,9 @@ install-obsolete-lists: .PHONY .MAKE
distrib-dirs: .PHONY check_DESTDIR
cd ${NETBSDSRCDIR}/etc/mtree && ${MAKE} distrib-dirs
-.if defined(USE_XZ_SETS) && ${USE_XZ_SETS} != "no"
-COMPRESS_PROGRAM=${TOOL_XZ}
+COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
XZ_OPT=-9
-TAR_SUFF=tar.xz
-.else
-COMPRESS_PROGRAM=${TOOL_GZIP}
-TAR_SUFF=tgz
-.endif
+TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
# release, snapshot --
# Build a full distribution including kernels & install media.
