nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug6843'

Browse Source
This commit is contained in:
Nick Mathewson 2012-09-19 09:01:15 -04:00
commit 0e0a167742
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug6843 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Our new buildsystem was overzealous about rebuilding manpages: it
would rebuild them all whenever any one of them changed. Now our
dependency checking should be correct. Fixes bug 6843; bugfix on
0.2.4.1-alpha.

30
doc/include.am
View File

@ -46,24 +46,46 @@ asciidoc_product = $(nodist_man1_MANS) $(doc_DATA)
# Generate the html documentation from asciidoc, but don't do # Generate the html documentation from asciidoc, but don't do
# machine-specific replacements yet # machine-specific replacements yet
$(html_in) : $(txt_in) $(html_in) :
$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/$@ $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/$@
# Generate the manpage from asciidoc, but don't do # Generate the manpage from asciidoc, but don't do
# machine-specific replacements yet # machine-specific replacements yet
$(man_in) : $(txt_in) $(man_in) :
$(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@ $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@
doc/tor.1.in: doc/tor.1.txt
doc/tor-gencert.1.in: doc/tor-gencert.1.txt
doc/tor-resolve.1.in: doc/tor-resolve.1.txt
doc/torify.1.in: doc/torify.1.txt
doc/tor-fw-helper.1.in: doc/tor-fw-helper.1.txt
doc/tor.html.in: doc/tor.1.txt
doc/tor-gencert.html.in: doc/tor-gencert.1.txt
doc/tor-resolve.html.in: doc/tor-resolve.1.txt
doc/torify.html.in: doc/torify.1.txt
doc/tor-fw-helper.html.in: doc/tor-fw-helper.1.txt
# use ../config.status to swap all machine-specific magic strings # use ../config.status to swap all machine-specific magic strings
# in the asciidoc with their replacements. # in the asciidoc with their replacements.
$(asciidoc_product) : $(txt_in) $(man_in) $(asciidoc_product) :
$(AM_V_GEN)$(MKDIR_P) $(@D) $(AM_V_GEN)$(MKDIR_P) $(@D)
$(AM_V_at)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \ $(AM_V_at)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \
cp $(top_srcdir)/$@.in $@; \ cp $(top_srcdir)/$@.in $@; \
fi fi
$(AM_V_at)./config.status -q --file=$@; $(AM_V_at)./config.status -q --file=$@;
$(doc_DATA) : $(html_in) doc/tor.html: doc/tor.html.in
doc/tor-gencert.html: doc/tor-gencert.html.in
doc/tor-resolve.html: doc/tor-resolve.html.in
doc/torify.html: doc/torify.html.in
doc/tor-fw-helper.html: doc/tor-fw-helper.html.in
doc/tor.1: doc/tor.1.in
doc/tor-gencert.1: doc/tor-gencert.1.in
doc/tor-resolve.1: doc/tor-resolve.1.in
doc/torify.1: doc/torify.1.in
doc/tor-fw-helper.1: doc/tor-fw-helper.1.in
CLEANFILES+= $(asciidoc_product) config.log CLEANFILES+= $(asciidoc_product) config.log
DISTCLEANFILES+= $(html_in) $(man_in) DISTCLEANFILES+= $(html_in) $(man_in)