diff options
| author | dougb <dougb@FreeBSD.org> | 2001-08-07 06:22:12 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2001-08-07 06:22:12 +0000 |
| commit | 147dccfbb75ffb5160bd3868d66fc251c25e1bb3 (patch) | |
| tree | 1253a6a9dbec00ce08fda23d5739b6540eee05d9 /usr.sbin | |
| parent | 0619ea75c37f69936602cf5923c7876f1e18429e (diff) | |
| download | FreeBSD-src-147dccfbb75ffb5160bd3868d66fc251c25e1bb3.zip FreeBSD-src-147dccfbb75ffb5160bd3868d66fc251c25e1bb3.tar.gz | |
Hopefully squish the problem of mm creating sendmail files in
the source tree once and for all.
Pointed out by: A cast of thousands
Reviewed by: asmodai
Diffstat (limited to 'usr.sbin')
| -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"; |
