diff options
| author | dougb <dougb@FreeBSD.org> | 2003-08-04 10:23:45 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-08-04 10:23:45 +0000 |
| commit | 01818123675239aeb601925ab51a70266ff164c2 (patch) | |
| tree | 90afb96ac9b0fa61f46062968e1f6749853ccc32 /usr.sbin/mergemaster | |
| parent | 8952fe07597b9a7c6604fbe36437acb994b7048f (diff) | |
| download | FreeBSD-src-01818123675239aeb601925ab51a70266ff164c2.zip FreeBSD-src-01818123675239aeb601925ab51a70266ff164c2.tar.gz | |
Use the actual build target (all), since relying on the build as a
side effect of the distribution target was apparently just good luck
all these years.
Submitted by: ru
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 66d8cf3..9df1326 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -508,6 +508,7 @@ case "${RERUN}" in esac make DESTDIR=${TEMPROOT} distrib-dirs && make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj obj && + make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj all && make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj DESTDIR=${TEMPROOT} \ distribution;} || { echo ''; |
