aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-22 20:46:15 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-22 20:46:15 -0500
commit2b9b694410fb0a6078290ed1652df608950a25cc (patch)
treec0d320a5419cb63005437e55944442c3b8cbf436
parentff3e90070fd21788ac2c1c9116f18c9b888c750a (diff)
downloadtor-2b9b694410fb0a6078290ed1652df608950a25cc.tar.gz
tor-2b9b694410fb0a6078290ed1652df608950a25cc.zip
Remove config.log from CLEANFILES
Fixes bug 17924; bugfix on 0.2.4.1-alpha. In ddf5020ea8d51, we added config.log to CLEANFILES in doc/Makefile.am so that distcheck would be happy about the presence of doc/config.log. But when we moved to nonrecursie makefiles in 2a4a1496241d6, we accidentally left that filename unchanged, so that it referred to config.log instead. Patch from cypherpunks.
-rw-r--r--changes/bug179244
-rw-r--r--doc/include.am2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug17924 b/changes/bug17924
new file mode 100644
index 0000000000..aa5cf58730
--- /dev/null
+++ b/changes/bug17924
@@ -0,0 +1,4 @@
+ o Minor bugfixes (makefile):
+ - Remove config.log only from make distclean, not from
+ make clean. Fixes bug 17924; bugfix on 0.2.4.1-alpha.
+
diff --git a/doc/include.am b/doc/include.am
index 01a5ef2524..7164a4b2a0 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -90,5 +90,5 @@ doc/tor-gencert.1: doc/tor-gencert.1.in
doc/tor-resolve.1: doc/tor-resolve.1.in
doc/torify.1: doc/torify.1.in
-CLEANFILES+= $(asciidoc_product) config.log
+CLEANFILES+= $(asciidoc_product)
DISTCLEANFILES+= $(html_in) $(man_in)