diff options
| author | teor <teor@torproject.org> | 2019-11-06 17:04:52 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-06 17:04:52 +1000 |
| commit | 23ff60c1509b005ad1fca758a8fa0745008ba22d (patch) | |
| tree | 3383a927689236e56f6f12fa4a307461e21acd6c | |
| parent | bf5b17d8bbcc55fbae67b5c45077b9dcba697048 (diff) | |
| parent | 10ef7a31cfa896fb8a4eddde92c4b7d1e7477ad6 (diff) | |
| download | tor-23ff60c1509b005ad1fca758a8fa0745008ba22d.tar.gz tor-23ff60c1509b005ad1fca758a8fa0745008ba22d.zip | |
Merge branch 'maint-0.4.2'
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | changes/bug31335 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 1234b6d22f..70965c2b1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -378,7 +378,7 @@ endif check-includes: if USEPYTHON - $(PYTHON) $(top_srcdir)/scripts/maint/practracker/includes.py + $(PYTHON) $(top_srcdir)/scripts/maint/practracker/includes.py $(top_srcdir) endif check-best-practices: diff --git a/changes/bug31335 b/changes/bug31335 new file mode 100644 index 0000000000..f633cf8b24 --- /dev/null +++ b/changes/bug31335 @@ -0,0 +1,3 @@ + o Minor bugfixes (code quality): + - Fix "make check-includes" so it runs correctly on out-of-tree builds. + Fixes bug 31335; bugfix on 0.3.5.1-alpha. |