tor

commit 593d29920e264180a7a6849fc59224a8869388d7
parent a39789a02c2d89eaa8289a68a6b0fab0cc4d71dc
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 29 Apr 2019 10:15:03 -0400

Merge remote-tracking branch 'tor-github/pr/974' into 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
@@ -220,7 +220,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.