Sat Sep 29 01:12:22 2018 UTC ()
Only test USE_XZ_SETS if it is defined.   This is probably not the
correct fix, so someone else please do it correctly - either this is
the wrong word, or it should be given a default value elsewhere.


(kre)
diff -r1.434 -r1.435 src/etc/Makefile
cvs diff -r1.434 -r1.435 src/etc/Makefile (expand / switch to unified diff)

--- src/etc/Makefile 2018/09/28 15:11:36 1.434
+++ src/etc/Makefile 2018/09/29 01:12:22 1.435
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.434 2018/09/28 15:11:36 martin Exp $ 1# $NetBSD: Makefile,v 1.435 2018/09/29 01:12:22 kre Exp $
2# from: @(#)Makefile 8.7 (Berkeley) 5/25/95 2# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
3 3
4# Environment variables without default values: 4# Environment variables without default values:
5# DESTDIR must be set before anything in this file will work. 5# DESTDIR must be set before anything in this file will work.
6# RELEASEDIR is where the tarred up stuff for a snapshot or 6# RELEASEDIR is where the tarred up stuff for a snapshot or
7# release will be placed. 7# release will be placed.
8# 8#
9# Environment variables with default values: 9# Environment variables with default values:
10# LOCALTIME will set the default local time for the system you 10# LOCALTIME will set the default local time for the system you
11# build; it determines what /etc/localtime is symlink'd to. 11# build; it determines what /etc/localtime is symlink'd to.
12# KERNSRCDIR points to kernel source; it is set by default to ../sys, 12# KERNSRCDIR points to kernel source; it is set by default to ../sys,
13# but can be overridden. 13# but can be overridden.
14# KERNOBJDIR is the kernel build directory, it defaults to 14# KERNOBJDIR is the kernel build directory, it defaults to
@@ -400,27 +400,27 @@ install-obsolete-lists: .PHONY .MAKE @@ -400,27 +400,27 @@ install-obsolete-lists: .PHONY .MAKE
400 ! cmp -s ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete/${file}; then \ 400 ! cmp -s ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete/${file}; then \
401 ${ETC_INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \ 401 ${ETC_INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
402 ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete; \ 402 ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete; \
403 else true; fi 403 else true; fi
404.endfor 404.endfor
405 405
406 406
407# distrib-dirs -- 407# distrib-dirs --
408# Populate $DESTDIR with directories needed by NetBSD 408# Populate $DESTDIR with directories needed by NetBSD
409# 409#
410distrib-dirs: .PHONY check_DESTDIR 410distrib-dirs: .PHONY check_DESTDIR
411 cd ${NETBSDSRCDIR}/etc/mtree && ${MAKE} distrib-dirs 411 cd ${NETBSDSRCDIR}/etc/mtree && ${MAKE} distrib-dirs
412 412
413.if ${USE_XZ_SETS} != "no" 413.if defined(USE_XZ_SETS) && ${USE_XZ_SETS} != "no"
414COMPRESS_PROGRAM=${TOOL_XZ} 414COMPRESS_PROGRAM=${TOOL_XZ}
415XZ_OPT=-9 415XZ_OPT=-9
416TAR_SUFF=tar.xz 416TAR_SUFF=tar.xz
417.else 417.else
418COMPRESS_PROGRAM=${TOOL_GZIP} 418COMPRESS_PROGRAM=${TOOL_GZIP}
419TAR_SUFF=tgz 419TAR_SUFF=tgz
420.endif 420.endif
421 421
422# release, snapshot -- 422# release, snapshot --
423# Build a full distribution including kernels & install media. 423# Build a full distribution including kernels & install media.
424# 424#
425release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR snap_md_post 425release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR snap_md_post
426 ${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets sets 426 ${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets sets