summaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2010-05-14 19:12:06 +0000
committerDoug Barton <dougb@FreeBSD.org>2010-05-14 19:12:06 +0000
commitde2bfae478cca280b0d19c6f87084dcd4c18ad65 (patch)
tree6d69ad09330ea53467f2eadc957a70afdc8c8c20 /usr.sbin/mergemaster
parentf7a5f7371a284ce3fc46d633926bea6938f7ecc0 (diff)
downloadsrc-test2-de2bfae478cca280b0d19c6f87084dcd4c18ad65.tar.gz
src-test2-de2bfae478cca280b0d19c6f87084dcd4c18ad65.zip
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
-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 84ee455d5fb7..4b20464b5f7c 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";