diff options
| author | brooks <brooks@FreeBSD.org> | 2013-04-25 21:19:50 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-04-25 21:19:50 +0000 |
| commit | 53230ee95f397e09bc5413f0fac91e6becaa524a (patch) | |
| tree | 186597eb3a824f6e98561afa3087a0441a3640cf /usr.sbin/mergemaster | |
| parent | 4f5865691ed697faad914567f8e6c9a6c1e6cb11 (diff) | |
| download | FreeBSD-src-53230ee95f397e09bc5413f0fac91e6becaa524a.zip FreeBSD-src-53230ee95f397e09bc5413f0fac91e6becaa524a.tar.gz | |
Use the system MAKEOBJDIRPREFIX when running make targets in
mergemaster. This allows bootstrap verions of tools to be used.
Add a note to UPDATING about this change.
Discussed with: jhb
Sponsored by: DARPA, AFRL
MFC after: 5 days
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 48b58f3..1838448 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -629,11 +629,10 @@ case "${RERUN}" in ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs >/dev/null ;; esac - od=${TEMPROOT}/usr/obj ${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;} || + ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc >/dev/null && + ${MM_MAKE} everything SUBDIR_OVERRIDE=etc >/dev/null && + ${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} || { echo ''; echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; echo " the temproot environment"; |
