aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-11-05 22:29:34 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-11-05 22:29:34 +0000
commitf7ef435bb686f82335153b2353b0f93b755b164b (patch)
treed0474e7ff3b61d55607d30ff0b54a7f2d33f927a /release/scripts
parent119b826a62b819dd420a90e0c5d715c79be63151 (diff)
downloadsrc-f7ef435bb686f82335153b2353b0f93b755b164b.tar.gz
src-f7ef435bb686f82335153b2353b0f93b755b164b.zip
Rework r325076: Just use the pre-existing OBJDIR.
Like was done in usr.sbin/mergemaster in r249906, we can just use the already-built OBJDIR for install(1). Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=325457
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/mm-mtree.sh10
1 files changed, 3 insertions, 7 deletions
diff --git a/release/scripts/mm-mtree.sh b/release/scripts/mm-mtree.sh
index 644f72ebb920..45c47be4f16e 100755
--- a/release/scripts/mm-mtree.sh
+++ b/release/scripts/mm-mtree.sh
@@ -114,14 +114,10 @@ echo ''
${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs
;;
esac
- od=${TEMPROOT}/usr/obj
${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs &&
- MAKEOBJDIRPREFIX=$od ${MM_MAKE} kernel-toolchain \
- MK_TOOLCHAIN=no MK_CROSS_COMPILER=no \
- MK_CDDL=no MK_TESTS=no MK_RESCUE=no &&
- MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
- MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
- MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
+ ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
+ ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
+ ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
{ echo '';
echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
echo " the temproot environment";