diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2009-01-04 20:59:23 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2009-01-04 20:59:23 +0000 |
| commit | e2af94387b38593267480c345b490b2ad2d96a20 (patch) | |
| tree | 8bf8fe3bde3fe8f9d5a15384d1039f616d26ee6f /usr.sbin | |
| parent | f38d120723e0cb732c71b6ca54d3b5ee0c73faf7 (diff) | |
| download | src-e2af94387b38593267480c345b490b2ad2d96a20.tar.gz src-e2af94387b38593267480c345b490b2ad2d96a20.zip | |
Instead of using obj and all targets which are not cross-build aware,
use _obj and everything which are.
Submitted by: ru
Notes
Notes:
svn path=/head/; revision=186749
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 075ef1a8939d..2f2f55b43d04 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -592,10 +592,11 @@ case "${RERUN}" in ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs ;; esac + od=${TEMPROOT}/usr/obj ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs && - MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} obj SUBDIR_OVERRIDE=etc && - MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} all SUBDIR_OVERRIDE=etc && - MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || + MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc && + MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc && + MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || { echo ''; echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; echo " the temproot environment"; |