diff options
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 8efbae7..92b327b 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -448,7 +448,9 @@ case "${RERUN}" in ;; esac make DESTDIR=${TEMPROOT} distrib-dirs && - make DESTDIR=${TEMPROOT} -DNO_MAKEDEV_RUN distribution;} || + make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj obj && + make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj DESTDIR=${TEMPROOT} \ + -DNO_MAKEDEV_RUN distribution;} || { echo ''; echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; echo " the temproot environment"; |
