From 6ba81e778ef7b615ff2a4e87ce3e7f46bf1165bf Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Mon, 5 Aug 2002 01:03:12 +0000 Subject: [PATCH] Fix a couple DESTDIR related problems. Credit for the "Only in" section goes to James , and Cyrille Lefevre . The make variables problem was found by jon. --- usr.sbin/mergemaster/mergemaster.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index ecf134cb655..6fdcd029b2a 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -533,7 +533,7 @@ case "${RERUN}" in echo ' might want to verify their status before rebooting your system.' echo '' press_to_continue - diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in /etc" | ${PAGER} + diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER} echo '' press_to_continue ;; @@ -1019,7 +1019,7 @@ case "${PRE_WORLD}" in echo "*** From ${DESTDIR}/etc/make.conf" echo "*** From ${MAKE_CONF}" - for MAKE_VAR in `grep -i ^[a-z] /etc/make.conf | cut -d '=' -f 1`; do + for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`; do echo '' grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf grep -w ^#${MAKE_VAR} ${MAKE_CONF} ||