diff options
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 2 | ||||
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 65d22ae..0174d90 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -295,7 +295,7 @@ with all values commented out: #DONT_CHECK_PAGER= # # If you set 'yes' above, make sure to include the PATH to your pager -#PATH=/bin:/usr/bin:/usr/sbin:/sbin +#PATH=/bin:/usr/bin:/usr/sbin # # Don't compare the old and new motd files #IGNORE_MOTD=yes diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index e7aee6a..1f4d31a 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -10,7 +10,7 @@ # $FreeBSD$ -PATH=/bin:/usr/bin:/usr/sbin:/sbin +PATH=/bin:/usr/bin:/usr/sbin display_usage () { VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` @@ -124,6 +124,7 @@ diff_loop () { echo '' if mm_install "${COMPFILE}"; then echo " *** ${COMPFILE} installed successfully" + echo '' # Make the list print one file per line AUTO_INSTALLED_FILES="${AUTO_INSTALLED_FILES} ${DESTDIR}${COMPFILE#.} " @@ -428,7 +429,12 @@ case "${RERUN}" in esac { cd ${SOURCEDIR} && - make DESTDIR=${DESTDIR} distrib-dirs && + case "${DESTDIR}" in + '') ;; + *) + make DESTDIR=${DESTDIR} distrib-dirs + ;; + esac make DESTDIR=${TEMPROOT} distrib-dirs && make DESTDIR=${TEMPROOT} -DNO_MAKEDEV distribution;} || { echo ''; @@ -475,7 +481,7 @@ case "${RERUN}" in esac # Avoid trying to update MAKEDEV if /dev is on a devfs - if sysctl vfs.devfs.generation > /dev/null 2>&1 ; then + if /sbin/sysctl vfs.devfs.generation > /dev/null 2>&1 ; then rm ${TEMPROOT}/dev/MAKEDEV ${TEMPROOT}/dev/MAKEDEV.local fi |
