Merge branch 'bug6843'

2 files changed, 31 insertions, 4 deletions

diff --git a/changes/bug6843 b/changes/bug6843
new file mode 100644
index 0000000000..1acfdbd284
--- /dev/null
+++ b/changes/bug6843
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Our new buildsystem was overzealous about rebuilding manpages: it
+      would rebuild them all whenever any one of them changed. Now our
+      dependency checking should be correct. Fixes bug 6843; bugfix on
+      0.2.4.1-alpha.
diff --git a/doc/include.am b/doc/include.am
index bb01038d4c..9eb919b9e5 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -46,24 +46,46 @@ asciidoc_product = $(nodist_man1_MANS) $(doc_DATA)
 
 # Generate the html documentation from asciidoc, but don't do
 # machine-specific replacements yet
-$(html_in) : $(txt_in)
+$(html_in) :
 	$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/$@
 
 # Generate the manpage from asciidoc, but don't do
 # machine-specific replacements yet
-$(man_in) : $(txt_in)
+$(man_in) :
 	$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@
 
+doc/tor.1.in: doc/tor.1.txt
+doc/tor-gencert.1.in: doc/tor-gencert.1.txt
+doc/tor-resolve.1.in: doc/tor-resolve.1.txt
+doc/torify.1.in: doc/torify.1.txt
+doc/tor-fw-helper.1.in: doc/tor-fw-helper.1.txt
+
+doc/tor.html.in: doc/tor.1.txt
+doc/tor-gencert.html.in: doc/tor-gencert.1.txt
+doc/tor-resolve.html.in: doc/tor-resolve.1.txt
+doc/torify.html.in: doc/torify.1.txt
+doc/tor-fw-helper.html.in: doc/tor-fw-helper.1.txt
+
 # use ../config.status to swap all machine-specific magic strings
 # in the asciidoc with their replacements.
-$(asciidoc_product) : $(txt_in) $(man_in)
+$(asciidoc_product) :
 	$(AM_V_GEN)$(MKDIR_P) $(@D)
 	$(AM_V_at)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \
 		cp $(top_srcdir)/$@.in $@; \
 	fi
 	$(AM_V_at)./config.status -q --file=$@;
 
-$(doc_DATA) : $(html_in)
+doc/tor.html: doc/tor.html.in
+doc/tor-gencert.html: doc/tor-gencert.html.in
+doc/tor-resolve.html: doc/tor-resolve.html.in
+doc/torify.html: doc/torify.html.in
+doc/tor-fw-helper.html: doc/tor-fw-helper.html.in
+
+doc/tor.1: doc/tor.1.in
+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
+doc/tor-fw-helper.1: doc/tor-fw-helper.1.in
 
 CLEANFILES+= $(asciidoc_product) config.log
 DISTCLEANFILES+= $(html_in) $(man_in)