aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-10-01 17:05:40 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-10-01 17:05:40 +0000
commitfadf2a24feb64564f71961a632b9fbeb6c298d15 (patch)
tree54deb767e4c640bf58b07fb265e1d7697691eb87 /release/Makefile
parentf6490fe596e86bc170f7617bfe12e99e8009f328 (diff)
downloadsrc-fadf2a24feb64564f71961a632b9fbeb6c298d15.tar.gz
src-fadf2a24feb64564f71961a632b9fbeb6c298d15.zip
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
Notes
Notes: svn path=/projects/release-vmimage/; revision=272376
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 7fdea8521d3f..6080898330b4 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}