From: Taylor Yu <catalyst@torproject.org>
Date: Thu, 26 Apr 2018 20:46:57 +0000 (-0500)
Subject: Merge branch 'bug25936-029' into bug25936-031
X-Git-Tag: tor-0.3.2.11~29^2^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59821050982a7e1c6906de61b6742546378e569c;p=thirdparty%2Ftor.git

Merge branch 'bug25936-029' into bug25936-031
---

59821050982a7e1c6906de61b6742546378e569c
diff --cc Makefile.am
index 79d2e78521,f06d0e3734..1a6d8e7d12
--- a/Makefile.am
+++ b/Makefile.am
@@@ -237,6 -217,11 +237,15 @@@ mostlyclean-local
  	rm -rf $(top_builddir)/doc/doxygen
  	rm -rf $(TEST_NETWORK_ALL_LOG_DIR)
  
 +clean-local:
 +	rm -rf $(top_builddir)/src/rust/target
 +	rm -rf $(top_builddir)/src/rust/.cargo/registry
++
+ # 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