Date: Sun, 1 Dec 2013 15:06:31 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258796 - head/release Message-ID: <201312011506.rB1F6VlX081131@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Dec 1 15:06:30 2013 New Revision: 258796 URL: http://svnweb.freebsd.org/changeset/base/258796 Log: - Prevent TARGET and TARGET_ARCH from being defined as empty when TARGET="" and/or TARGET_ARCH="" is specified. - Remove extra (). Modified: head/release/Makefile Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Sun Dec 1 14:03:03 2013 (r258795) +++ head/release/Makefile Sun Dec 1 15:06:30 2013 (r258796) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312011506.rB1F6VlX081131>