[tor-commits] [tor/master] Fix build of torify.1

[nickm@xxxxxxxxxxxxxx]

commit 91f6a422cc2a7801e399111353e20ddbe2e17f33
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Mar 26 12:11:38 2014 -0400

    Fix build of torify.1
    
    The build was broken by changes in f8c45339f72525c68, but we didn't
    notice, since that commit also made torify.1 only get built when
    tor-fw-helper was turned on.
    
    Fixes bug 11321; bugfix on Tor 0.2.5.1-alpha.
---
 changes/bug11321 |    5 +++++
 doc/include.am   |   22 ++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/changes/bug11321 b/changes/bug11321
new file mode 100644
index 0000000..d737a1f
--- /dev/null
+++ b/changes/bug11321
@@ -0,0 +1,5 @@
+  o Minor bugfixes (build):
+    - Build the torify.1 manpage again. Previously, we were only
+      trying to build it when also building tor-fw-helper. That's why
+      we didn't notice that we'd broken the ability to build it.
+      Fixes bug 11321; bugfix on 0.2.5.1-alpha.
diff --git a/doc/include.am b/doc/include.am
index 37c0237..30d3e20 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -12,17 +12,17 @@
 # part of the source distribution, so that people without asciidoc can
 # just use the .1 and .html files.
 
-regular_mans = doc/tor doc/tor-gencert doc/tor-resolve
-all_mans = $(regular_mans) doc/torify doc/tor-fw-helper
-
-if USE_ASCIIDOC
+base_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify
+all_mans = $(base_mans) doc/tor-fw-helper
 if USE_FW_HELPER
-nodist_man1_MANS = $(all_mans:=.1)
-doc_DATA = $(all_mans:=.html)
+install_mans = $(all_mans)
 else
-nodist_man1_MANS = $(regular_mans:=.1)
-doc_DATA = $(regular_mans:=.html)
+install_mans = $(base_mans)
 endif
+
+if USE_ASCIIDOC
+nodist_man1_MANS = $(install_mans:=.1)
+doc_DATA = $(install_mans:=.html)
 html_in = $(all_mans:=.html.in)
 man_in = $(all_mans:=.1.in)
 txt_in = $(all_mans:=.1.txt)
@@ -53,11 +53,13 @@ $(man_in) :
 	$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@
 
 doc/tor.1.in: doc/tor.1.txt
+doc/torify.1.in: doc/torify.1.txt
 doc/tor-gencert.1.in: doc/tor-gencert.1.txt
 doc/tor-resolve.1.in: doc/tor-resolve.1.txt
 doc/tor-fw-helper.1.in: doc/tor-fw-helper.1.txt
 
 doc/tor.html.in: doc/tor.1.txt
+doc/torify.html.in: doc/torify.1.txt
 doc/tor-gencert.html.in: doc/tor-gencert.1.txt
 doc/tor-resolve.html.in: doc/tor-resolve.1.txt
 doc/tor-fw-helper.html.in: doc/tor-fw-helper.1.txt
@@ -74,13 +76,13 @@ $(asciidoc_product) :
 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.1.txt
+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.txt
+doc/torify.1: doc/torify.1.in
 doc/tor-fw-helper.1: doc/tor-fw-helper.1.in
 
 CLEANFILES+= $(asciidoc_product) config.log



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits