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

Merge branch 'build-wo-asciidoc-on-bsd'

Browse Source
This commit is contained in:
Nick Mathewson 2010-08-11 09:42:05 -04:00
commit 1cf19b5046
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
changes/makefile-var-exp
View File

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

20
doc/Makefile.am
View File

@ -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