aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2013-12-02 18:47:57 +0000
committerGlen Barber <gjb@FreeBSD.org>2013-12-02 18:47:57 +0000
commitf7f650c76a4f1424fb49d9c86e9419fcc738ce94 (patch)
treefc513797415b0ba975f154ed7ef63a20b4f7e357 /release/Makefile
parentfa6b4c32ba8ac12937b60dcbcc5549f83b08fddc (diff)
downloadsrc-f7f650c76a4f1424fb49d9c86e9419fcc738ce94.tar.gz
src-f7f650c76a4f1424fb49d9c86e9419fcc738ce94.zip
Turn off the dvdrom target by default. dvd1.iso is now built by
specifying 'WITH_DVD=1' during 'make release'. This caused some problems during the freebsd-update builds for 10.0-BETA4. MFC after: 3 days Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=258853
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile
index e2507765fe45..ff773b9877dc 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -20,7 +20,7 @@
# NOPORTS: if set, do not distribute ports tree
# NOSRC: if set, do not distribute source tree
# NODOC: if set, do not generate release documentation
-# NODVD: if set, do not generate dvd1.iso
+# WITH_DVD: if set, generate dvd1.iso
# TARGET/TARGET_ARCH: architecture of built release
#
@@ -79,7 +79,7 @@ IMAGES=
.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
RELEASE_TARGETS+= cdrom
IMAGES+= disc1.iso bootonly.iso
-. if !defined(NODVD)
+. if defined(WITH_DVD)
RELEASE_TARGETS+= dvdrom
IMAGES+= dvd1.iso
. endif