summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-10-22 15:04:32 +0000
committerphk <phk@FreeBSD.org>2002-10-22 15:04:32 +0000
commit3ef2ff6c9db960f23d46e4141ff5c498bb830fdf (patch)
tree57fce8291cda5a695c4bb550c76b31abc3058b5c /usr.sbin/mergemaster
parent5a6e603c6a9d51acb78e6ed10d027f92376b3f0d (diff)
downloadFreeBSD-src-3ef2ff6c9db960f23d46e4141ff5c498bb830fdf.zip
FreeBSD-src-3ef2ff6c9db960f23d46e4141ff5c498bb830fdf.tar.gz
Don't use NO_MAKEDEV* option, its the default now.
Diffstat (limited to 'usr.sbin/mergemaster')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 7fcd93c..d2f1f90 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -500,7 +500,7 @@ case "${RERUN}" in
make DESTDIR=${TEMPROOT} distrib-dirs &&
make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj obj &&
make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj DESTDIR=${TEMPROOT} \
- -DNO_MAKEDEV_RUN distribution;} ||
+ distribution;} ||
{ echo '';
echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
echo " the temproot environment";
OpenPOWER on IntegriCloud