summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-06-12 13:55:32 +0200
committerSebastian Hahn <sebastian@torproject.org>2011-06-12 13:58:53 +0200
commit910dadd6eab5b2b3af3b655f52b861085f379b84 (patch)
treecea35fdbff27da717b9eecd643ed94cf80e22333 /doc
parentecc9a364c2ff8557f808dc1826e285239a5767a8 (diff)
downloadtor-910dadd6eab5b2b3af3b655f52b861085f379b84.tar.gz
tor-910dadd6eab5b2b3af3b655f52b861085f379b84.zip
Ensure the release tarball contains all manpages
Thanks to Nick for the idea for the fix.
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am18
1 files changed, 10 insertions, 8 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6cc0ea99fb..d8d9fbefc2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,19 +12,21 @@
# part of the source distribution, so that people without asciidoc can
# just use the .1 and .html files.
+regular_mans = tor tor-gencert tor-resolve torify
+all_mans = $(regular_mans) tor-fw-helper
+
if USE_ASCIIDOC
if USE_FW_HELPER
-asciidoc_files = tor tor-gencert tor-resolve torify tor-fw-helper
+nodist_man_MANS = $(all_mans:=.1)
+doc_DATA = $(all_mans:=.html)
else
-asciidoc_files = tor tor-gencert tor-resolve torify
+nodist_man_MANS = $(regular_mans:=.1)
+doc_DATA = $(regular_mans:=.html)
endif
-html_in = $(asciidoc_files:=.html.in)
-man_in = $(asciidoc_files:=.1.in)
-txt_in = $(asciidoc_files:=.1.txt)
-nodist_man_MANS = $(asciidoc_files:=.1)
-doc_DATA = $(asciidoc_files:=.html)
+html_in = $(all_mans:=.html.in)
+man_in = $(all_mans:=.1.in)
+txt_in = $(all_mans:=.1.txt)
else
-asciidoc_files =
html_in =
man_in =
txt_in =