diff options
| author | gjb <gjb@FreeBSD.org> | 2013-12-02 18:47:57 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-12-02 18:47:57 +0000 |
| commit | f289f4d4b861f7749c0eca8b6ba420ea1b3386e7 (patch) | |
| tree | fc513797415b0ba975f154ed7ef63a20b4f7e357 /release/Makefile | |
| parent | 951b6724108165a5f179f774515e96cd51f877c7 (diff) | |
| download | FreeBSD-src-f289f4d4b861f7749c0eca8b6ba420ea1b3386e7.zip FreeBSD-src-f289f4d4b861f7749c0eca8b6ba420ea1b3386e7.tar.gz | |
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
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index e250776..ff773b9 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 |
