From 26cb4b87917f81e8fcb34070cccf57b83109c424 Mon Sep 17 00:00:00 2001 From: chrisrd Date: Thu, 22 Feb 2018 07:35:59 +1100 Subject: [PATCH] Allow make checkstyle and paxscript in build dir Reviewed-by: Giuseppe Di Natale Reviewed-by: Brian Behlendorf Reviewed-by: George Melikov Signed-off-by: Chris Dunlop Closes #7202 --- Makefile.am | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 07d583fdf4..90a1c94755 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,19 +45,20 @@ checkstyle: cstyle shellcheck flake8 commitcheck mancheck testscheck commitcheck: @if git rev-parse --git-dir > /dev/null 2>&1; then \ - scripts/commitcheck.sh; \ + ${top_srcdir}/scripts/commitcheck.sh; \ fi cstyle: @find ${top_srcdir} -name '*.[hc]' ! -name 'zfs_config.*' \ - ! -name '*.mod.c' -type f -exec scripts/cstyle.pl -cpP {} \+ + ! -name '*.mod.c' -type f \ + -exec ${top_srcdir}/scripts/cstyle.pl -cpP {} \+ shellcheck: @if type shellcheck > /dev/null 2>&1; then \ shellcheck --exclude=SC1090 --format=gcc \ - $$(find scripts/*.sh -type f) \ - $$(find cmd/zed/zed.d/*.sh -type f) \ - $$(find cmd/zpool/zpool.d/* -executable); \ + $$(find ${top_srcdir}/scripts/*.sh -type f) \ + $$(find ${top_srcdir}/cmd/zed/zed.d/*.sh -type f) \ + $$(find ${top_srcdir}/cmd/zpool/zpool.d/* -executable); \ fi mancheck: @@ -88,7 +89,7 @@ cppcheck: paxcheck: @if type scanelf > /dev/null 2>&1; then \ - scripts/paxcheck.sh ${top_srcdir}; \ + ${top_srcdir}/scripts/paxcheck.sh ${top_srcdir}; \ fi flake8: