d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework r325076: Just use the pre-existing OBJDIR.

Browse Source 
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
This commit is contained in:
bdrewery 2017-11-05 22:29:34 +00:00
parent 155b2c78cc
commit 0d19cd1b92
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/scripts/mm-mtree.sh
View File

@ -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";