diff options
| author | hrs <hrs@FreeBSD.org> | 2013-12-01 15:06:30 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2013-12-01 15:06:30 +0000 |
| commit | 3af21b4c79694479bdc415b4e06469b69e8ce42b (patch) | |
| tree | 096d394bef2a934a74426b25443fc24a558d9055 /release/Makefile | |
| parent | 3e72024170599ddea9bcfaf5b55cebbcc98c95ae (diff) | |
| download | FreeBSD-src-3af21b4c79694479bdc415b4e06469b69e8ce42b.zip FreeBSD-src-3af21b4c79694479bdc415b4e06469b69e8ce42b.tar.gz | |
- Prevent TARGET and TARGET_ARCH from being defined as empty when
TARGET="" and/or TARGET_ARCH="" is specified.
- Remove extra ().
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile index 056d288..cbd8766 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 |
