commit 206d28ff152f2df5ccf966a5923804718f49b43b parent efeb101b968fe6604ff97604afe527a36b94cfc9 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 29 Apr 2019 10:15:11 -0400 Merge branch 'maint-0.4.0' Diffstat:
| M | Makefile.am | | | 2 | +- |
| A | changes/bug30263 | | | 3 | +++ |
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am @@ -226,7 +226,7 @@ shellcheck: if command -v shellcheck; then \ find $(top_srcdir)/scripts/ -name "*.sh" -exec shellcheck {} +; \ if [ -d "$(top_srcdir)/scripts/test" ]; then \ - shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_builddir)/scripts/test/coverage; \ + shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_srcdir)/scripts/test/coverage; \ fi; \ fi diff --git a/changes/bug30263 b/changes/bug30263 @@ -0,0 +1,3 @@ + o Minor bugfixes (shellcheck): + - Stop looking for scripts in the build directory during + "make shellcheck". Fixes bug 30263; bugfix on 0.4.0.1-alpha.