aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2013-12-01 15:06:30 +0000
committerHiroki Sato <hrs@FreeBSD.org>2013-12-01 15:06:30 +0000
commit464485c8d04dc7e28ad8d4470d48722df37647a1 (patch)
tree096d394bef2a934a74426b25443fc24a558d9055 /release/Makefile
parentb865f8ef405f90a052c20d458930d11659409e13 (diff)
downloadsrc-464485c8d04dc7e28ad8d4470d48722df37647a1.tar.gz
src-464485c8d04dc7e28ad8d4470d48722df37647a1.zip
- Prevent TARGET and TARGET_ARCH from being defined as empty when
TARGET="" and/or TARGET_ARCH="" is specified. - Remove extra ().
Notes
Notes: svn path=/head/; revision=258796
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile
index 056d28814f67..cbd87661c7d8 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -29,11 +29,15 @@ PORTSDIR?= /usr/ports
DOCDIR?= /usr/doc
RELNOTES_LANG?= en_US.ISO8859-1
-TARGET?= ${MACHINE}
+.if !defined(TARGET) || empty(TARGET)
+TARGET= ${MACHINE}
+.endif
+.if !defined(TARGET_ARCH) || empty(TARGET_ARCH)
.if ${TARGET} == ${MACHINE}
-TARGET_ARCH?= ${MACHINE_ARCH}
+TARGET_ARCH= ${MACHINE_ARCH}
.else
-TARGET_ARCH?= ${TARGET}
+TARGET_ARCH= ${TARGET}
+.endif
.endif
IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
DISTDIR= dist
@@ -75,7 +79,7 @@ IMAGES=
.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
RELEASE_TARGETS+= cdrom
IMAGES+= disc1.iso bootonly.iso
-. if(!defined(NODVD))
+. if !defined(NODVD)
RELEASE_TARGETS+= dvdrom
IMAGES+= dvd1.iso
. endif