diff options
| -rw-r--r-- | changes/makefile-var-exp | 8 | ||||
| -rw-r--r-- | doc/Makefile.am | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/changes/makefile-var-exp b/changes/makefile-var-exp new file mode 100644 index 000000000..c0f778228 --- /dev/null +++ b/changes/makefile-var-exp @@ -0,0 +1,8 @@ + o Minor bugfixes: + - 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 e7edb0476..d976f9d6f 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) |