svn commit: r208088 - head/usr.sbin/mergemaster
Doug Barton
dougb at FreeBSD.org
Fri May 14 19:12:09 UTC 2010
Author: dougb
Date: Fri May 14 19:12:06 2010
New Revision: 208088
URL: http://svn.freebsd.org/changeset/base/208088
Log:
Hide the creation and population of the temproot
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh Fri May 14 19:12:01 2010 (r208087)
+++ head/usr.sbin/mergemaster/mergemaster.sh Fri May 14 19:12:06 2010 (r208088)
@@ -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";
More information about the svn-src-all
mailing list