From: Eric Biggers <ebiggers@xxxxxxxxxx>
To match the usual convention, the fsverity-utils Makefile now takes a
PREFIX variable which defaults to /usr/local.
But xfstests-bld wants PREFIX=/usr, so set that.
Also don't explicitly build the 'all' target, since 'install' depends on
it already.
Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
---
build-all | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build-all b/build-all
index 0122628..572edfa 100755
--- a/build-all
+++ b/build-all
@@ -290,7 +290,7 @@ if test -z "$SKIP_FSVERITY"; then
build_start "fsverity"
(cd fsverity; \
ver=$(git describe --always --dirty); echo "fsverity $ver ($(git log -1 --pretty=%cD))" > ../fsverity.ver ; \
- $MAKE_CLEAN ; make $J all ; make install DESTDIR=$DESTDIR)
+ $MAKE_CLEAN ; make $J install DESTDIR=$DESTDIR PREFIX=/usr)
fi
if test -z "$SKIP_IMA_EVM_UTILS" ; then
--
2.26.2
|