From 3efadcd0d5373cc38986cdf93d03a1d99ec8aee0 Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Mon, 18 Jan 2010 22:28:56 +0100 Subject: [PATCH] Move the torify manpage into the doc dir --- contrib/Makefile.am | 4 +--- doc/Makefile.am | 4 ++-- {contrib => doc}/torify.1 | 0 3 files changed, 3 insertions(+), 5 deletions(-) rename {contrib => doc}/torify.1 (100%) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index c42892a85d..d42e91ec97 100644 --- 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 79123d81d5..f8e17ecd3e 100644 --- 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