summaryrefslogtreecommitdiffstats
path: root/release/Makefile
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2014-10-01 17:05:40 +0000
committergjb <gjb@FreeBSD.org>2014-10-01 17:05:40 +0000
commit78c1b9246c7c5d1207ca380a4b221d6ee25fe17b (patch)
tree54deb767e4c640bf58b07fb265e1d7697691eb87 /release/Makefile
parentfc37b6640c4c9b79bdc61bbd2263e1d8e6b7cd74 (diff)
downloadFreeBSD-src-78c1b9246c7c5d1207ca380a4b221d6ee25fe17b.zip
FreeBSD-src-78c1b9246c7c5d1207ca380a4b221d6ee25fe17b.tar.gz
Separate release/scripts/mk-vmimage.sh to machine-specific
scripts, making it possible to mimic the functionality for non-x86 targets. Move echo output if MAKEFLAGS is empty outside of usage(). Remove TARGET/TARGET_ARCH evaluation. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile
index 7fdea85..6080898 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -321,7 +321,7 @@ vm-base:
VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} \
DESTDIR=${.OBJDIR}/${.TARGET} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET}
+ ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET}
.endif
touch ${.TARGET}
@@ -330,7 +330,7 @@ vm-image: vm-base
. for FORMAT in ${VMFORMATS}
env FORMAT=${FORMAT} VMIMAGE=${VMBASE}.${FORMAT} VMBASE=${VMBASE}.img \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET}
+ ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET}
. endfor
.endif
touch ${.TARGET}
OpenPOWER on IntegriCloud