diff options
| author | dougb <dougb@FreeBSD.org> | 2010-05-14 19:12:06 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2010-05-14 19:12:06 +0000 |
| commit | fbe23b303761bf831317e74efcf7986b3e19496f (patch) | |
| tree | 6d69ad09330ea53467f2eadc957a70afdc8c8c20 /usr.sbin/mergemaster | |
| parent | 518f6e2bd250b9c03d4581e6b2e3b49d423c0e7e (diff) | |
| download | FreeBSD-src-fbe23b303761bf831317e74efcf7986b3e19496f.zip FreeBSD-src-fbe23b303761bf831317e74efcf7986b3e19496f.tar.gz | |
Hide the creation and population of the temproot
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 84ee455..4b20464 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"; |
