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 | |
| parent | 863b6c439e6bfc64f602ecb9526940fa966ca9fe (diff) | |
| parent | 5b69cf85fa3e234a5aedcd8a509ad73d6d08b226 (diff) | |
| download | tor-1cf19b5046ed8024355851f478dc3ffa6f79740e.tar.gz tor-1cf19b5046ed8024355851f478dc3ffa6f79740e.zip | |
Merge branch 'build-wo-asciidoc-on-bsd'
| -rw-r--r-- | changes/makefile-var-exp | 11 | ||||
| -rw-r--r-- | doc/Makefile.am | 20 |
2 files changed, 15 insertions, 16 deletions
diff --git a/changes/makefile-var-exp b/changes/makefile-var-exp index 14e6a725bb..9918e2a511 100644 --- a/changes/makefile-var-exp +++ b/changes/makefile-var-exp @@ -1,8 +1,5 @@ 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. Doesn't fix bug 1773; - bugfix on 0.2.2.9-alpha. - + - Don't use substitution references ($(VAR:MOD)) when + $(asciidoc_files) is empty -- make(1) on NetBSD transforms + '$(:x)' to 'x' rather than the empty string. This bites us in + doc/ when configured with --disable-asciidoc. Fixes bug 1773. 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 |