From: Linus Nordberg <linus@torproject.org>
Date: Fri, 30 Jul 2010 11:54:38 +0000 (+0200)
Subject: Fix compilation issue in doc/Makefile.am on NetBSD
X-Git-Tag: tor-0.2.2.15-alpha~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ef609b88609fc498aef94249179c20df0976dbf;p=thirdparty%2Ftor.git

Fix compilation issue in doc/Makefile.am on NetBSD

* doc/Makefile.am: Change $(VAR:MOD) to ${VAR:MOD} -- make(1) on
NetBSD substitutes '$(:x)' to 'x' rather than the empty string.  This
bites us in doc/ when configured with `--disable-asciidoc'.  Curly
braces should work in all implementations of make(1) but this patch
changes only the places where we use the VAR:MOD expansion.
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e7edb0476b..d976f9d6fa 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,20 +19,20 @@ else
 asciidoc_files =
 endif
 
-html_in = $(asciidoc_files:=.html.in)
+html_in = ${asciidoc_files:=.html.in}
 
-man_in = $(asciidoc_files:=.1.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) ${asciidoc_files:=.1.txt}  \
              tor-osx-dmg-creation.txt tor-rpm-creation.txt   \
              tor-win32-mingw-creation.txt
 
-nodist_man_MANS = $(asciidoc_files:=.1)
+nodist_man_MANS = ${asciidoc_files:=.1}
 
 docdir = @docdir@
 
-doc_DATA = $(asciidoc_files:=.html)
+doc_DATA = ${asciidoc_files:=.html}
 
 asciidoc_product = $(nodist_man_MANS) $(doc_DATA)