aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorguilhem <tor@guilhem.org>2013-09-28 16:08:15 -0400
committerNick Mathewson <nickm@torproject.org>2013-09-29 13:59:17 -0400
commitf8c45339f72525c6826d6db6a5e2acc4d7475952 (patch)
tree330fad23a374b37b565dfff49f0a18eb8222dc8c /doc
parent1b6ea92a5751f2388bacd7c234bea1063ecd586d (diff)
downloadtor-f8c45339f72525c6826d6db6a5e2acc4d7475952.tar
tor-f8c45339f72525c6826d6db6a5e2acc4d7475952.tar.gz
Don't preprocess torify
Since torify has been removed from tsocks, it doesn't need to be preprocessed. Closes #5505.
Diffstat (limited to 'doc')
-rw-r--r--doc/include.am10
1 files changed, 4 insertions, 6 deletions
diff --git a/doc/include.am b/doc/include.am
index 9695292bd..37c0237a0 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -12,8 +12,8 @@
# 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 doc/torify
-all_mans = $(regular_mans) doc/tor-fw-helper
+regular_mans = doc/tor doc/tor-gencert doc/tor-resolve
+all_mans = $(regular_mans) doc/torify doc/tor-fw-helper
if USE_ASCIIDOC
if USE_FW_HELPER
@@ -55,13 +55,11 @@ $(man_in) :
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
@@ -76,13 +74,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.html.in
+doc/torify.html: doc/torify.1.txt
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/torify.1: doc/torify.1.txt
doc/tor-fw-helper.1: doc/tor-fw-helper.1.in
CLEANFILES+= $(asciidoc_product) config.log