From: Taylor Yu <catalyst@torproject.org>
Date: Thu, 26 Apr 2018 21:07:56 +0000 (-0500)
Subject: Merge branch 'bug25936-032' into bug25936-033
X-Git-Tag: tor-0.3.3.6~29^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b;p=thirdparty%2Ftor.git

Merge branch 'bug25936-032' into bug25936-033
---

f0dc6c8e2a68764b73ea4b3fdb50f74b070c183b
diff --cc Makefile.am
index 04ca88a236,4d2d9d222a..08cb8e3e7e
--- a/Makefile.am
+++ b/Makefile.am
@@@ -250,7 -248,11 +250,15 @@@ clean-local
  	rm -rf $(top_builddir)/src/rust/target
  	rm -rf $(top_builddir)/src/rust/.cargo/registry
  
 +if USE_RUST
 +distclean-local: distclean-rust
 +endif
 +
+ # This relies on some internal details of how automake implements
+ # distcheck.  We check two directories because automake-1.15 changed
+ # from $(distdir)/_build to $(distdir)/_build/sub.
+ show-distdir-testlog:
+ 	@if test -d "$(distdir)/_build/sub"; then \
+ 	  cat $(distdir)/_build/sub/$(TEST_SUITE_LOG); \
+ 	else \
+ 	  cat $(distdir)/_build/$(TEST_SUITE_LOG); fi