d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple DESTDIR related problems. Credit for the "Only in" section

Browse Source 
goes to James <James_Bond_79@yahoo.com>, and Cyrille Lefevre
<cyrille.lefevre@laposte.net>. The make variables problem was found
by jon.
This commit is contained in:
Doug Barton 2002-08-05 01:03:12 +00:00
parent 9e2518582d
commit 6ba81e778e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=101348
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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} ||