diff options
| author | billf <billf@FreeBSD.org> | 2000-02-12 22:14:02 +0000 |
|---|---|---|
| committer | billf <billf@FreeBSD.org> | 2000-02-12 22:14:02 +0000 |
| commit | 056ce7147a825ddc2e170b14b0ef1eaf3b6a02cd (patch) | |
| tree | 8c05bf3f1bb6fe5e3dc622523b8d27bf77c3ee58 /usr.sbin/mergemaster | |
| parent | 0efdb1e4732f89ebf7744c4cdd0602bd24b0ba93 (diff) | |
| download | FreeBSD-src-056ce7147a825ddc2e170b14b0ef1eaf3b6a02cd.zip FreeBSD-src-056ce7147a825ddc2e170b14b0ef1eaf3b6a02cd.tar.gz | |
Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.
Submitted by: Doug Barton <Doug@gorean.org> (maintainer)
Approved by: you-know-who.
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 ace6d6c..367d538 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"; |
