diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-11 09:42:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-11 09:42:05 -0400 |
| commit | 1cf19b5046ed8024355851f478dc3ffa6f79740e (patch) | |
| tree | bf8a96e023636f6fd8fb4168241d8b42be584915 /doc | |
| parent | 863b6c439e6bfc64f602ecb9526940fa966ca9fe (diff) | |
| parent | 5b69cf85fa3e234a5aedcd8a509ad73d6d08b226 (diff) | |
| download | tor-1cf19b5046ed8024355851f478dc3ffa6f79740e.tar.gz tor-1cf19b5046ed8024355851f478dc3ffa6f79740e.zip | |
Merge branch 'build-wo-asciidoc-on-bsd'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 2e70fd7474..0f649d664a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -15,25 +15,27 @@ if USE_ASCIIDOC asciidoc_files = tor tor-gencert tor-resolve torify +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) else asciidoc_files = +html_in = +man_in = +txt_in = +nodist_man_MANS = +doc_DATA = endif -html_in = ${asciidoc_files:=.html.in} - -man_in = ${asciidoc_files:=.1.in} - EXTRA_DIST = HACKING asciidoc-helper.sh \ - $(html_in) $(man_in) ${asciidoc_files:=.1.txt} \ + $(html_in) $(man_in) $(txt_in) \ tor-osx-dmg-creation.txt tor-rpm-creation.txt \ tor-win32-mingw-creation.txt -nodist_man_MANS = ${asciidoc_files:=.1} - docdir = @docdir@ -doc_DATA = ${asciidoc_files:=.html} - asciidoc_product = $(nodist_man_MANS) $(doc_DATA) SUBDIRS = spec |