|
@@ -12,8 +12,8 @@
|
|
|
# part of the source distribution, so that people without asciidoc can
|
|
|
# just use the .1 and .html files.
|
|
|
|
|
|
-regular_mans = tor tor-gencert tor-resolve torify
|
|
|
-all_mans = $(regular_mans) tor-fw-helper
|
|
|
+regular_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify
|
|
|
+all_mans = $(regular_mans) doc/tor-fw-helper
|
|
|
|
|
|
if USE_ASCIIDOC
|
|
|
if USE_FW_HELPER
|
|
@@ -34,11 +34,11 @@ nodist_man_MANS =
|
|
|
doc_DATA =
|
|
|
endif
|
|
|
|
|
|
-EXTRA_DIST = HACKING asciidoc-helper.sh \
|
|
|
- $(html_in) $(man_in) $(txt_in) \
|
|
|
- tor-rpm-creation.txt \
|
|
|
- tor-win32-mingw-creation.txt spec/README \
|
|
|
- state-contents.txt
|
|
|
+EXTRA_DIST+= doc/HACKING doc/asciidoc-helper.sh \
|
|
|
+ $(html_in) $(man_in) $(txt_in) \
|
|
|
+ doc/tor-rpm-creation.txt \
|
|
|
+ doc/tor-win32-mingw-creation.txt doc/spec/README \
|
|
|
+ doc/state-contents.txt
|
|
|
|
|
|
docdir = @docdir@
|
|
|
|
|
@@ -47,43 +47,43 @@ asciidoc_product = $(nodist_man_MANS) $(doc_DATA)
|
|
|
# Generate the html documentation from asciidoc, but don't do
|
|
|
# machine-specific replacements yet
|
|
|
$(html_in) :
|
|
|
- $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@
|
|
|
+ $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/$@
|
|
|
|
|
|
-tor.html.in : tor.1.txt
|
|
|
-torify.html.in : torify.1.txt
|
|
|
-tor-gencert.html.in : tor-gencert.1.txt
|
|
|
-tor-resolve.html.in : tor-resolve.1.txt
|
|
|
-tor-fw-helper.html.in : tor-fw-helper.1.txt
|
|
|
+doc/tor.html.in : doc/tor.1.txt
|
|
|
+doc/torify.html.in : doc/torify.1.txt
|
|
|
+doc/tor-gencert.html.in : doc/tor-gencert.1.txt
|
|
|
+doc/tor-resolve.html.in : doc/tor-resolve.1.txt
|
|
|
+doc/tor-fw-helper.html.in : doc/tor-fw-helper.1.txt
|
|
|
|
|
|
# Generate the manpage from asciidoc, but don't do
|
|
|
# machine-specific replacements yet
|
|
|
$(man_in) :
|
|
|
- $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@
|
|
|
+ $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@
|
|
|
|
|
|
-tor.1.in : tor.1.txt
|
|
|
-torify.1.in : torify.1.txt
|
|
|
-tor-gencert.1.in : tor-gencert.1.txt
|
|
|
-tor-resolve.1.in : tor-resolve.1.txt
|
|
|
-tor-fw-helper.1.in : tor-fw-helper.1.txt
|
|
|
+doc/tor.1.in : doc/tor.1.txt
|
|
|
+doc/torify.1.in : doc/torify.1.txt
|
|
|
+doc/tor-gencert.1.in : doc/tor-gencert.1.txt
|
|
|
+doc/tor-resolve.1.in : doc/tor-resolve.1.txt
|
|
|
+doc/tor-fw-helper.1.in : doc/tor-fw-helper.1.txt
|
|
|
|
|
|
# use ../config.status to swap all machine-specific magic strings
|
|
|
# in the asciidoc with their replacements.
|
|
|
$(asciidoc_product) :
|
|
|
- $(AM_V_GEN)if test -e $(top_srcdir)/doc/$@.in && ! test -e ./$@.in ; then \
|
|
|
- cp $(top_srcdir)/doc/$@.in .; \
|
|
|
+ $(AM_V_GEN)if test -e $(top_srcdir)/$@.in && ! test -e $@.in ; then \
|
|
|
+ cp $(top_srcdir)/$@.in doc/.; \
|
|
|
fi
|
|
|
- $(AM_V_GEN)../config.status --file=$@;
|
|
|
+ $(AM_V_GEN)$(top_srcdir)/config.status --file=$@;
|
|
|
|
|
|
-tor.1 : tor.1.in
|
|
|
-torify.1 : torify.1.in
|
|
|
-tor-gencert.1 : tor-gencert.1.in
|
|
|
-tor-resolve.1 : tor-resolve.1.in
|
|
|
-tor-fw-helper.1 : tor-fw-helper.1.in
|
|
|
-tor.html : tor.html.in
|
|
|
-torify.html : torify.html.in
|
|
|
-tor-gencert.html : tor-gencert.html.in
|
|
|
-tor-resolve.html : tor-resolve.html.in
|
|
|
-tor-fw-helper.html : tor-fw-helper.html.in
|
|
|
+doc/tor.1 : doc/tor.1.in
|
|
|
+doc/torify.1 : doc/torify.1.in
|
|
|
+doc/tor-gencert.1 : doc/tor-gencert.1.in
|
|
|
+doc/tor-resolve.1 : doc/tor-resolve.1.in
|
|
|
+doc/tor-fw-helper.1 : doc/tor-fw-helper.1.in
|
|
|
+doc/tor.html : doc/tor.html.in
|
|
|
+doc/torify.html : doc/torify.html.in
|
|
|
+doc/tor-gencert.html : doc/tor-gencert.html.in
|
|
|
+doc/tor-resolve.html : doc/tor-resolve.html.in
|
|
|
+doc/tor-fw-helper.html : doc/tor-fw-helper.html.in
|
|
|
|
|
|
-CLEANFILES = $(asciidoc_product) config.log
|
|
|
-DISTCLEANFILES = $(html_in) $(man_in)
|
|
|
+CLEANFILES+= $(asciidoc_product) config.log
|
|
|
+DISTCLEANFILES+= $(html_in) $(man_in)
|