Move the torify manpage into the doc dir

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index c42892a85ddf115597c0e1b0b19a4d1aa6ba8904..d42e91ec97c4da9f7f1e8ae2b5fc69d85a701632 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -3,10 +3,8 @@ DIST_SUBDIRS = osx suse
 
 confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = exitlist tor-tsocks.conf torify.1 tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html
+EXTRA_DIST = exitlist tor-tsocks.conf tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html
 
 conf_DATA = tor-tsocks.conf
 
 bin_SCRIPTS = torify
-
-man_MANS = torify.1

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 79123d81d59d0e79b352f2356ae94d82306c5cd3..f8e17ecd3eb421d0a4d6a0dc3d4da4548710fd0a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,9 +2,9 @@
 EXTRA_DIST = HACKING                                         \
              tor-resolve.1 tor-gencert.1                     \
              tor-osx-dmg-creation.txt tor-rpm-creation.txt   \
-             tor-win32-mingw-creation.txt
+             tor-win32-mingw-creation.txt torify.1
 
-man_MANS = tor.1 tor-resolve.1 tor-gencert.1
+man_MANS = tor.1 tor-resolve.1 tor-gencert.1 torify.1
 
 SUBDIRS = design-paper spec
 

diff --git a/contrib/torify.1 b/doc/torify.1
similarity index 100%
rename from contrib/torify.1
rename to doc/torify.1