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

Hide the creation and population of the temproot

Browse Source
This commit is contained in:
Doug Barton 2010-05-14 19:12:06 +00:00
parent f7a5f7371a
commit de2bfae478
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=208088
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/mergemaster/mergemaster.sh
View File

@ -617,14 +617,14 @@ case "${RERUN}" in
case "${DESTDIR}" in
'') ;;
*)
${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs
${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs >/dev/null
;;
esac
od=${TEMPROOT}/usr/obj
${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs &&
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} DESTDIR=${TEMPROOT} distrib-dirs >/dev/null &&
MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc >/dev/null &&
MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc >/dev/null &&
MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} ||
{ echo '';
echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
echo " the temproot environment";