- Prevent TARGET and TARGET_ARCH from being defined as empty when

TARGET="" and/or TARGET_ARCH="" is specified.
- Remove extra ().
This commit is contained in:
Hiroki Sato 2013-12-01 15:06:30 +00:00
parent b865f8ef40
commit 464485c8d0
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=258796

View file

@ -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