svn commit: r281809 - head/release/tools

[Glen Barber]

Author: gjb
Date: Tue Apr 21 02:49:44 2015
New Revision: 281809
URL: https://svnweb.freebsd.org/changeset/base/281809

Log:
  Simplify variable expansion in attempt to fix the vm-image build.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/vmimage.subr

Modified: head/release/tools/vmimage.subr
==============================================================================
--- head/release/tools/vmimage.subr	Tue Apr 21 02:02:25 2015	(r281808)
+++ head/release/tools/vmimage.subr	Tue Apr 21 02:49:44 2015	(r281809)
@@ -14,9 +14,9 @@ write_partition_layout() {
 		SWAPOPT="-p freebsd-swap/swapfs::1G"
 	fi
 
-	_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)"
-	if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then
-		BOOTFILES="${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
+	_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR | tr -d '/usr/src')"
+	if [ -d "${_OBJDIR}/${TARGET}.${TARGET_ARCH}" ]; then
+		BOOTFILES="${_OBJDIR}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
 	else
 		BOOTFILES="${_OBJDIR}/usr/src/sys/boot"
 	fi