diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-08-30 14:40:10 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2014-08-30 14:40:10 +0000 |
| commit | f72cc703a34874ec6697564c0b30844b65e449a8 (patch) | |
| tree | 14b7687592beb1c472a24ca92932e03781156c13 | |
| parent | 2734ca1e1b216ed31e552b8a53e6311d3faac7ba (diff) | |
DESTDIR is gone.
from Nathanael Rensen, thanks!
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 87aa73114b9..df1d39f2ad0 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.156 2014/08/29 06:52:20 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.157 2014/08/30 14:40:09 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -208,7 +208,7 @@ sm_populate() { # redirect stderr in case file got removed # manually but is still in the sum file _matchsum=$(cd ${_TMPROOT} && \ - sha256 -c ${DESTDIR}/${DBDIR}/${_i} 2>/dev/null | \ + sha256 -c /usr/share/sysmerge/${_i} 2>/dev/null | \ awk '/OK/ { print $2 }' | \ sed 's/[:]//') for _j in ${_matchsum}; do |