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

* 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.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2e70fd747458341427a041c5b8cbd87660ff882c..0f649d664a2a90df590167908007de03702567f9 100644 (file)
--- 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