Mailing List Archive

[master] 89a558e56 man: Reference sources from $(srcdir)
commit 89a558e56390d425c52732a6c94087eec9083115
Author: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
Date: Wed Oct 21 08:03:42 2020 +0200

man: Reference sources from $(srcdir)

Better diff with the --word-diff --word-diff-regex=. options.

diff --git a/man/Makefile.am b/man/Makefile.am
index f04a0647c..641a384f1 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -30,70 +30,70 @@ RST2ANY_FLAGS = --halt=2

BUILD_MAN = $(AM_V_GEN) $(RST2MAN) $(RST2ANY_FLAGS)

-varnish-cli.7: $(top_builddir)/doc/sphinx/reference/varnish-cli.rst \
+varnish-cli.7: $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst \
$(top_builddir)/doc/sphinx/include/cli.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnish-cli.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnish-cli.rst $@

-varnish-counters.7: $(top_builddir)/doc/sphinx/reference/varnish-counters.rst \
+varnish-counters.7: $(top_srcdir)/doc/sphinx/reference/varnish-counters.rst \
$(top_builddir)/doc/sphinx/include/counters.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnish-counters.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnish-counters.rst $@

-vcl.7: $(top_builddir)/doc/sphinx/reference/vcl.rst \
- $(top_builddir)/doc/sphinx/reference/vcl_var.rst \
+vcl.7: $(top_srcdir)/doc/sphinx/reference/vcl.rst \
+ $(top_srcdir)/doc/sphinx/reference/vcl_var.rst \
$(top_srcdir)/bin/varnishd/builtin.vcl
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/vcl.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/vcl.rst $@

-vsl.7: $(top_builddir)/doc/sphinx/reference/vsl.rst \
+vsl.7: $(top_srcdir)/doc/sphinx/reference/vsl.rst \
$(top_builddir)/doc/sphinx/include/vsl-tags.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/vsl.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/vsl.rst $@

-vsl-query.7: $(top_builddir)/doc/sphinx/reference/vsl-query.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/vsl-query.rst $@
+vsl-query.7: $(top_srcdir)/doc/sphinx/reference/vsl-query.rst
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/vsl-query.rst $@

-varnishadm.1: $(top_builddir)/doc/sphinx/reference/varnishadm.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishadm.rst $@
+varnishadm.1: $(top_srcdir)/doc/sphinx/reference/varnishadm.rst
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnishadm.rst $@

varnishd.1: \
- $(top_builddir)/doc/sphinx/reference/varnishd.rst \
+ $(top_srcdir)/doc/sphinx/reference/varnishd.rst \
$(top_builddir)/doc/sphinx/include/params.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishd.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnishd.rst $@

varnishncsa.1: \
- $(top_builddir)/doc/sphinx/reference/varnishncsa.rst \
+ $(top_srcdir)/doc/sphinx/reference/varnishncsa.rst \
$(top_builddir)/doc/sphinx/include/varnishncsa_options.rst \
$(top_builddir)/doc/sphinx/include/varnishncsa_synopsis.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishncsa.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnishncsa.rst $@

varnishlog.1: \
- $(top_builddir)/doc/sphinx/reference/varnishlog.rst \
+ $(top_srcdir)/doc/sphinx/reference/varnishlog.rst \
$(top_builddir)/doc/sphinx/include/varnishlog_options.rst \
$(top_builddir)/doc/sphinx/include/varnishlog_synopsis.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishlog.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnishlog.rst $@

-varnishstat.1: $(top_builddir)/doc/sphinx/reference/varnishstat.rst \
+varnishstat.1: $(top_srcdir)/doc/sphinx/reference/varnishstat.rst \
$(top_builddir)/doc/sphinx/include/varnishstat_options.rst \
$(top_builddir)/doc/sphinx/include/varnishstat_synopsis.rst \
$(top_builddir)/doc/sphinx/include/varnishstat_bindings.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishstat.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnishstat.rst $@

-varnishtest.1: $(top_builddir)/doc/sphinx/reference/varnishtest.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishtest.rst $@
+varnishtest.1: $(top_srcdir)/doc/sphinx/reference/varnishtest.rst
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnishtest.rst $@

-vtc.7: $(top_builddir)/doc/sphinx/reference/vtc.rst \
+vtc.7: $(top_srcdir)/doc/sphinx/reference/vtc.rst \
$(top_builddir)/doc/sphinx/include/vtc-syntax.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/vtc.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/vtc.rst $@

varnishtop.1: \
- $(top_builddir)/doc/sphinx/reference/varnishtop.rst \
+ $(top_srcdir)/doc/sphinx/reference/varnishtop.rst \
$(top_builddir)/doc/sphinx/include/varnishtop_options.rst \
$(top_builddir)/doc/sphinx/include/varnishtop_synopsis.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishtop.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnishtop.rst $@

varnishhist.1: \
- $(top_builddir)/doc/sphinx/reference/varnishhist.rst \
+ $(top_srcdir)/doc/sphinx/reference/varnishhist.rst \
$(top_builddir)/doc/sphinx/include/varnishhist_options.rst \
$(top_builddir)/doc/sphinx/include/varnishhist_synopsis.rst
- $(BUILD_MAN) $(top_builddir)/doc/sphinx/reference/varnishhist.rst $@
+ $(BUILD_MAN) $(top_srcdir)/doc/sphinx/reference/varnishhist.rst $@

vmod_cookie.3: $(top_builddir)/lib/libvmod_cookie/vmod_cookie.man.rst
$(BUILD_MAN) $? $@
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
Re: [master] 89a558e56 man: Reference sources from $(srcdir) [ In reply to ]
FTR, this was done on purpose because the previous (incomplete) solution to the
VPATH problem relied on all the rst files residing in the single builddir tree.

I hope PR "Accomodate VPATH builds (#3443)" really solves the issue, otherwise
this change would go in the wrong direction, IMHO.

Unfortunately, I have other priorities overriding a timely review.

--

** * * UPLEX - Nils Goroll Systemoptimierung

Scheffelstraße 32
22301 Hamburg

tel +49 40 28805731
mob +49 170 2723133
fax +49 40 42949753

xmpp://slink@jabber.int.uplex.de/

http://uplex.de/
Re: [master] 89a558e56 man: Reference sources from $(srcdir) [ In reply to ]
On Thu, Oct 22, 2020 at 3:40 PM Nils Goroll <nils.goroll@uplex.de> wrote:
>
> FTR, this was done on purpose because the previous (incomplete) solution to the
> VPATH problem relied on all the rst files residing in the single builddir tree.

I'm starting to have recollections of a triple commit revert.

> I hope PR "Accomodate VPATH builds (#3443)" really solves the issue, otherwise
> this change would go in the wrong direction, IMHO.

I hope so too.

> Unfortunately, I have other priorities overriding a timely review.

Got it.
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit