diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-29 10:15:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-29 10:15:11 -0400 |
| commit | 83f10c77dabc242c3e28740a4336741ff564b22e (patch) | |
| tree | 6890a2fe498f0bfbc5ca42aae9ce509dc05b7617 | |
| parent | 88d6c2568d4a1ccc6fd3865e95bfb5243bf90395 (diff) | |
| parent | 593d29920e264180a7a6849fc59224a8869388d7 (diff) | |
| download | tor-83f10c77dabc242c3e28740a4336741ff564b22e.tar.gz tor-83f10c77dabc242c3e28740a4336741ff564b22e.zip | |
Merge branch 'maint-0.4.0' into release-0.4.0
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | changes/bug30263 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d65c08f6bf..8bf2aaf910 100644 --- 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 new file mode 100644 index 0000000000..ba81c1b8a1 --- /dev/null +++ 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. |