summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/Makefile.am4
-rwxr-xr-xcontrib/tor-resolve.py (renamed from contrib/tor-resolve)0
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/tor-resolve.1 (renamed from contrib/tor-resolve.1)0
4 files changed, 3 insertions, 3 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index a073c91080..05491fe1ea 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -4,6 +4,6 @@ EXTRA_DIST = tor-tsocks.conf torify.1 tor-resolve.1 tor.spec tor-resolve
conf_DATA = tor-tsocks.conf
-bin_SCRIPTS = torify tor-resolve
+bin_SCRIPTS = torify
-man_MANS = torify.1 tor-resolve.1
+man_MANS = torify.1
diff --git a/contrib/tor-resolve b/contrib/tor-resolve.py
index 31b44af9d4..31b44af9d4 100755
--- a/contrib/tor-resolve
+++ b/contrib/tor-resolve.py
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d0a0307d2e..83bb0c428d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
EXTRA_DIST = tor-spec.txt CLIENTS FAQ HACKING rend-spec.txt tor-doc.html tor-doc.css
-man_MANS = tor.1
+man_MANS = tor.1 tor-resolve.1
SUBDIRS = design-paper
diff --git a/contrib/tor-resolve.1 b/doc/tor-resolve.1
index 9c25f4475d..9c25f4475d 100644
--- a/contrib/tor-resolve.1
+++ b/doc/tor-resolve.1