nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug #1773: Revert bad fix (4ef609b8) and do it properly.

Browse Source 
* doc/Makefile.am: Move $(VAR:MOD) expansions inside "if USE_ASCIIDOC".
* doc/Makefile.am: Use proper variable name for text input files.
* doc/Makefile.am: Initialize vars to empty when !USE_ASCIIDOC.
This commit is contained in:
Linus Nordberg 2010-08-09 21:44:21 +02:00 committed by Nick Mathewson
parent 863b6c439e
commit 0b96abe74f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/Makefile.am
View File

@ -15,25 +15,27 @@
if USE_ASCIIDOC if USE_ASCIIDOC
asciidoc_files = tor tor-gencert tor-resolve torify 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 else
asciidoc_files = asciidoc_files =
html_in =
man_in =
txt_in =
nodist_man_MANS =
doc_DATA =
endif endif
html_in = ${asciidoc_files:=.html.in}
man_in = ${asciidoc_files:=.1.in}
EXTRA_DIST = HACKING asciidoc-helper.sh \ 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-osx-dmg-creation.txt tor-rpm-creation.txt \
tor-win32-mingw-creation.txt tor-win32-mingw-creation.txt
nodist_man_MANS = ${asciidoc_files:=.1}
docdir = @docdir@ docdir = @docdir@
doc_DATA = ${asciidoc_files:=.html}
asciidoc_product = $(nodist_man_MANS) $(doc_DATA) asciidoc_product = $(nodist_man_MANS) $(doc_DATA)
SUBDIRS = spec SUBDIRS = spec