diff options
| author | Bill Fumerola <billf@FreeBSD.org> | 2000-02-12 22:14:02 +0000 |
|---|---|---|
| committer | Bill Fumerola <billf@FreeBSD.org> | 2000-02-12 22:14:02 +0000 |
| commit | 638a3aacaa16911cd9d8ce800f78c17e4a68dac8 (patch) | |
| tree | 05087a059b42284a86982e02d816f9121b2188f7 /usr.sbin/mergemaster | |
| parent | 53492ec8717adf8f277d23fd039026a14fbf648a (diff) | |
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index ace6d6c4a907..367d53840873 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -238,7 +238,7 @@ case "${RERUN}" in { cd ${SOURCEDIR} && make DESTDIR=${TEMPROOT} distrib-dirs && - make DESTDIR=${TEMPROOT} distribution;} || + make DESTDIR=${TEMPROOT} -DNO_MAKEDEV distribution;} || { echo ''; echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to the"; echo " temproot environment"; |