aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2010-05-18 02:17:40 +0000
committerDoug Barton <dougb@FreeBSD.org>2010-05-18 02:17:40 +0000
commit7ca82ab6a0a3f8acaafc66bc632c946bf3066a14 (patch)
tree66ba99ac7b0f0b8934b793121e43af4d0694ad50
parent379e47715a1e0bd31de9fa9f92897026c41aa63b (diff)
Notes
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 43126ae84f4f..311f226924b2 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -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";