Sat Apr 6 13:00:31 2013 UTC ()
Don't print warning even if mkisofs is not found.


(uebayasi)
diff -r1.406 -r1.407 src/etc/Makefile
cvs diff -r1.406 -r1.407 src/etc/Makefile (expand / switch to unified diff)

--- src/etc/Makefile 2013/02/24 03:06:13 1.406
+++ src/etc/Makefile 2013/04/06 13:00:31 1.407
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.406 2013/02/24 03:06:13 jmmv Exp $ 1# $NetBSD: Makefile,v 1.407 2013/04/06 13:00:31 uebayasi 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
@@ -43,27 +43,27 @@ @@ -43,27 +43,27 @@
43.MAKEOVERRIDES+= USETOOLS 43.MAKEOVERRIDES+= USETOOLS
44 44
45TZDIR= /usr/share/zoneinfo 45TZDIR= /usr/share/zoneinfo
46LOCALTIME?= UTC 46LOCALTIME?= UTC
47CKSUM?= ${TOOL_CKSUM} 47CKSUM?= ${TOOL_CKSUM}
48MAKESUMS= MAKE=${MAKE:Q} CKSUM=${CKSUM:Q} ${HOST_SH} ${NETBSDSRCDIR}/distrib/sets/makesums 48MAKESUMS= MAKE=${MAKE:Q} CKSUM=${CKSUM:Q} ${HOST_SH} ${NETBSDSRCDIR}/distrib/sets/makesums
49DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh 49DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
50 50
51# Flags for creating ISO CDROM image 51# Flags for creating ISO CDROM image
52# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools 52# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools
53# Note: At least mkisofs 2.0 should be used. 53# Note: At least mkisofs 2.0 should be used.
54# 54#
55.if !defined(MKISOFS) 55.if !defined(MKISOFS)
56MKISOFS!= (which mkisofs || echo true) 56MKISOFS!= (which mkisofs || echo true) 2>/dev/null
57.endif 57.endif
58DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s 58DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s
59# ISO 9660 volume ID. Note that this can only contain [A-Z0-9_]. 59# ISO 9660 volume ID. Note that this can only contain [A-Z0-9_].
60ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z 60ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z
61MKISOFS_FLAGS+= -J -l -hide-joliet-trans-tbl -r -T \ 61MKISOFS_FLAGS+= -J -l -hide-joliet-trans-tbl -r -T \
62 -V ${ISO_VOLID} \ 62 -V ${ISO_VOLID} \
63 -publisher "The NetBSD Project" \ 63 -publisher "The NetBSD Project" \
64 -m "${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom" 64 -m "${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom"
65.if ${MKISOFS_FLAGS:N-v} 65.if ${MKISOFS_FLAGS:N-v}
66MKISOFS_FLAGS+= -quiet 66MKISOFS_FLAGS+= -quiet
67.endif 67.endif
68  68
69 69