From f8c45339f72525c6826d6db6a5e2acc4d7475952 Mon Sep 17 00:00:00 2001
From: guilhem <tor@guilhem.org>
Date: Sat, 28 Sep 2013 16:08:15 -0400
Subject: [PATCH] Don't preprocess torify

Since torify has been removed from tsocks, it doesn't need to be
preprocessed. Closes #5505.
---
 .gitignore                    |  2 --
 configure.ac                  |  1 -
 contrib/{torify.in => torify} |  0
 doc/include.am                | 10 ++++------
 4 files changed, 4 insertions(+), 9 deletions(-)
 rename contrib/{torify.in => torify} (100%)

diff --git a/.gitignore b/.gitignore
index 201d04da66..65f4d3f390 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,9 +110,7 @@
 /doc/tor-resolve.html.in
 /doc/tor-resolve.1.xml
 /doc/torify.1
-/doc/torify.1.in
 /doc/torify.html
-/doc/torify.html.in
 /doc/torify.1.xml
 
 # /doc/spec/
diff --git a/configure.ac b/configure.ac
index 7259d88126..2dd3a1e545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1488,7 +1488,6 @@ AC_CONFIG_FILES([
         contrib/tor.logrotate
         contrib/tor.sh
         contrib/torctl
-        contrib/torify
         src/config/torrc.sample
 ])
 
diff --git a/contrib/torify.in b/contrib/torify
similarity index 100%
rename from contrib/torify.in
rename to contrib/torify
diff --git a/doc/include.am b/doc/include.am
index 9695292bdf..37c0237a00 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