commit 910dadd6eab5b2b3af3b655f52b861085f379b84 Author: Sebastian Hahn <sebastian@torproject.org> Date: Sun Jun 12 13:55:32 2011 +0200 Ensure the release tarball contains all manpages Thanks to Nick for the idea for the fix. --- changes/bug3389 | 4 ++++ doc/Makefile.am | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/changes/bug3389 b/changes/bug3389 new file mode 100644 index 0000000..2442f4f --- /dev/null +++ b/changes/bug3389 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Always ship the tor-fw-helper manpage in our release tarballs. Bugfix + on 0.2.3.1-alpha; fixes bug 3389. Reported by Stephen Walker. + diff --git a/doc/Makefile.am b/doc/Makefile.am index 6cc0ea9..d8d9fbe 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 =