aboutsummaryrefslogtreecommitdiff
path: root/doc/include.am
diff options
context:
space:
mode:
Diffstat (limited to 'doc/include.am')
-rw-r--r--doc/include.am20
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/include.am b/doc/include.am
index 9695292bd..30d3e20d8 100644
--- a/doc/include.am
+++ b/doc/include.am
@@ -12,17 +12,17 @@
# 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
-
-if USE_ASCIIDOC
+base_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify
+all_mans = $(base_mans) doc/tor-fw-helper
if USE_FW_HELPER
-nodist_man1_MANS = $(all_mans:=.1)
-doc_DATA = $(all_mans:=.html)
+install_mans = $(all_mans)
else
-nodist_man1_MANS = $(regular_mans:=.1)
-doc_DATA = $(regular_mans:=.html)
+install_mans = $(base_mans)
endif
+
+if USE_ASCIIDOC
+nodist_man1_MANS = $(install_mans:=.1)
+doc_DATA = $(install_mans:=.html)
html_in = $(all_mans:=.html.in)
man_in = $(all_mans:=.1.in)
txt_in = $(all_mans:=.1.txt)
@@ -53,15 +53,15 @@ $(man_in) :
$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@
doc/tor.1.in: doc/tor.1.txt
+doc/torify.1.in: doc/torify.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/torify.html.in: doc/torify.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