From 910dadd6eab5b2b3af3b655f52b861085f379b84 Mon Sep 17 00:00:00 2001
From: Sebastian Hahn <sebastian@torproject.org>
Date: Sun, 12 Jun 2011 13:55:32 +0200
Subject: Ensure the release tarball contains all manpages

Thanks to Nick for the idea for the fix.
---
 doc/Makefile.am | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'doc/Makefile.am')

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6cc0ea99f..d8d9fbefc 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 =
-- 
cgit v1.2.3